diff --git a/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java b/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java
index 35c7a94..32d884e 100644
--- a/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java
+++ b/src/main/java/eu/ztsh/wymiana/web/model/UserCreateRequest.java
@@ -8,6 +8,6 @@ public record UserCreateRequest(
     @NotNull String name,
     @NotNull String surname,
     @Adult String pesel,
-    @Min(0) double pln) {
+    @Min(0) int pln) {
 
 }
diff --git a/src/test/java/eu/ztsh/wymiana/EntityCreator.java b/src/test/java/eu/ztsh/wymiana/EntityCreator.java
deleted file mode 100644
index 9caa4c8..0000000
--- a/src/test/java/eu/ztsh/wymiana/EntityCreator.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package eu.ztsh.wymiana;
-
-import eu.ztsh.wymiana.data.entity.CurrencyEntity;
-import eu.ztsh.wymiana.data.entity.UserEntity;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-public class EntityCreator {
-
-    public static class Constants {
-
-        public static String PESEL = "00281018264";
-        public static String NAME = "Janina";
-        public static String SURNAME = "Kowalska";
-        public static double PLN = 20.10;
-
-    }
-
-    public static UserEntityBuilder user() {
-        return new UserEntityBuilder();
-    }
-
-    public static class UserEntityBuilder {
-
-        String name;
-        String surname;
-        String pesel;
-        double pln;
-        double usd;
-
-        public UserEntityBuilder name(String name) {
-            this.name = name;
-            return this;
-        }
-
-        public UserEntityBuilder surname(String surname) {
-            this.surname = surname;
-            return this;
-        }
-
-        public UserEntityBuilder pesel(String pesel) {
-            this.pesel = pesel;
-            return this;
-        }
-
-        public UserEntityBuilder pln(double pln) {
-            this.pln = pln;
-            return this;
-        }
-
-        public UserEntityBuilder usd(double usd) {
-            this.usd = usd;
-            return this;
-        }
-
-        public UserEntity build() {
-            var nonnulPesel = Optional.ofNullable(pesel).orElse(Constants.NAME);
-            List<CurrencyEntity> currencies = new ArrayList<>();
-            if (pln > 0) {
-                currencies.add(new CurrencyEntity(nonnulPesel, "PLN", pln));
-            }
-            if (usd > 0) {
-                currencies.add(new CurrencyEntity(nonnulPesel, "USD", usd));
-            }
-            if (currencies.isEmpty()) {
-                currencies.add(new CurrencyEntity(nonnulPesel, "PLN", Constants.PLN));
-            }
-            return new UserEntity(
-                Optional.ofNullable(name).orElse(Constants.NAME),
-                Optional.ofNullable(surname).orElse(Constants.SURNAME),
-                nonnulPesel,
-                currencies
-            );
-        }
-
-    }
-
-}
diff --git a/src/test/java/eu/ztsh/wymiana/RepositoryBasedTest.java b/src/test/java/eu/ztsh/wymiana/RepositoryBasedTest.java
deleted file mode 100644
index cd0ffcf..0000000
--- a/src/test/java/eu/ztsh/wymiana/RepositoryBasedTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package eu.ztsh.wymiana;
-
-import eu.ztsh.wymiana.data.entity.UserEntity;
-import eu.ztsh.wymiana.data.repository.UserRepository;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@SpringBootTest
-@ExtendWith(SpringExtension.class)
-public abstract class RepositoryBasedTest {
-
-    protected final UserRepository userRepository;
-
-    public RepositoryBasedTest(UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
-
-    @BeforeEach
-    void prepareTest() {
-        userRepository.deleteAll();
-    }
-
-    public void expect(UserEntity entity) {
-        assertThat(userRepository.findById(entity.getPesel()))
-            .isNotEmpty()
-            .get()
-            .usingRecursiveComparison()
-            .isEqualTo(entity);
-    }
-
-}
diff --git a/src/test/java/eu/ztsh/wymiana/data/repository/UserRepositoryTest.java b/src/test/java/eu/ztsh/wymiana/data/repository/UserRepositoryTest.java
index 63cd478..1da3e81 100644
--- a/src/test/java/eu/ztsh/wymiana/data/repository/UserRepositoryTest.java
+++ b/src/test/java/eu/ztsh/wymiana/data/repository/UserRepositoryTest.java
@@ -1,26 +1,49 @@
 package eu.ztsh.wymiana.data.repository;
 
-import eu.ztsh.wymiana.EntityCreator;
-import eu.ztsh.wymiana.RepositoryBasedTest;
+import eu.ztsh.wymiana.data.entity.CurrencyEntity;
+import eu.ztsh.wymiana.data.entity.UserEntity;
 import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-class UserRepositoryTest extends RepositoryBasedTest {
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest
+@ExtendWith(SpringExtension.class)
+class UserRepositoryTest {
+
+    private final UserRepository userRepository;
 
     @Autowired
     UserRepositoryTest(UserRepository userRepository) {
-        super(userRepository);
+        this.userRepository = userRepository;
+    }
+
+    @BeforeEach
+    void prepareTest() {
+        userRepository.deleteAll();
     }
 
     @Test
     @Transactional
     @DisplayName("Basic insert & get test")
     void basicTest() {
-        var entity = EntityCreator.user().build();
+        var pesel = "00281018264";
+        var entity = new UserEntity(pesel, "Janina", "Kowalska",
+            List.of(new CurrencyEntity(pesel, "PLN", 20.10)));
         userRepository.save(entity);
-        expect(entity);
+        assertThat(userRepository.findById(pesel))
+            .isNotEmpty()
+            .get()
+            .usingRecursiveComparison()
+            .isEqualTo(entity);
     }
 
 }