diff --git a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java
index c64e9b2..c26f5ad 100644
--- a/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java
+++ b/src/test/java/eu/ztsh/wymiana/service/CurrencyServiceTest.java
@@ -6,7 +6,6 @@ import eu.ztsh.wymiana.data.repository.UserRepository;
 import eu.ztsh.wymiana.exception.InsufficientFundsException;
 import eu.ztsh.wymiana.validation.InstanceValidator;
 import eu.ztsh.wymiana.validation.ValidationFailedException;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -61,11 +60,12 @@ class CurrencyServiceTest extends RepositoryBasedTest {
 
     @Test
     void insufficientFundsTest() {
-        assertThatThrownBy(() -> currencyService.exchange(EntityCreator.exchangeRequest()
+        var entity = EntityCreator.exchangeRequest()
             .from(PLN_SYMBOL)
             .to(USD_SYMBOL)
             .toBuy(PLN)
-            .build()))
+            .build();
+        assertThatThrownBy(() -> currencyService.exchange(entity))
             .isInstanceOf(InsufficientFundsException.class);
     }
 
@@ -73,32 +73,35 @@ class CurrencyServiceTest extends RepositoryBasedTest {
     @ParameterizedTest
     @MethodSource
     void invalidPeselTest(String pesel) {
-        assertThatThrownBy(() -> currencyService.exchange(EntityCreator.exchangeRequest()
+        var entity = EntityCreator.exchangeRequest()
             .pesel(pesel)
             .from(PLN_SYMBOL)
             .to(USD_SYMBOL)
             .toSell(USD_SELL)
-            .build()))
+            .build();
+        assertThatThrownBy(() -> currencyService.exchange(entity))
             .isInstanceOf(ValidationFailedException.class);
     }
 
     @Test
     @DisplayName("Empty 'from' value")
     void emptyFromTest() {
-        assertThatThrownBy(() -> currencyService.exchange(EntityCreator.exchangeRequest()
+        var entity = EntityCreator.exchangeRequest()
             .to(USD_SYMBOL)
             .toSell(USD_SELL)
-            .build()))
+            .build();
+        assertThatThrownBy(() -> currencyService.exchange(entity))
             .isInstanceOf(ValidationFailedException.class);
     }
 
     @Test
     @DisplayName("Empty 'to' value")
     void emptyToTest() {
-        assertThatThrownBy(() -> currencyService.exchange(EntityCreator.exchangeRequest()
+        var entity = EntityCreator.exchangeRequest()
             .from(PLN_SYMBOL)
             .toSell(USD_SELL)
-            .build()))
+            .build();
+        assertThatThrownBy(() -> currencyService.exchange(entity))
             .isInstanceOf(ValidationFailedException.class);
     }
 
diff --git a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java
index 3a3a4d1..5226e14 100644
--- a/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java
+++ b/src/test/java/eu/ztsh/wymiana/validation/ValidExchangeRequestValidatorTest.java
@@ -2,15 +2,13 @@ package eu.ztsh.wymiana.validation;
 
 import eu.ztsh.wymiana.EntityCreator;
 import eu.ztsh.wymiana.web.model.CurrencyExchangeRequest;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
 
-import java.util.stream.Stream;
-
-import static eu.ztsh.wymiana.EntityCreator.Constants.*;
+import static eu.ztsh.wymiana.EntityCreator.Constants.PLN_SYMBOL;
+import static eu.ztsh.wymiana.EntityCreator.Constants.USD_BUY;
+import static eu.ztsh.wymiana.EntityCreator.Constants.USD_SELL;
+import static eu.ztsh.wymiana.EntityCreator.Constants.USD_SYMBOL;
 
 class ValidExchangeRequestValidatorTest extends ValidatorTest<ValidExchangeRequestValidator, CurrencyExchangeRequest> {