diff --git a/workitems/load-test-curl.sh b/workitems/load-test-curl.sh
index e0277fa..f40149d 100644
--- a/workitems/load-test-curl.sh
+++ b/workitems/load-test-curl.sh
@@ -13,7 +13,7 @@ b=""
 c="content"
 while [ "$b" != "$c" ];
 do
-	a=$(curl -s http://<server>/api/users/api/v1/users);
+	a=$(curl -s http://<server>/api/workitems/api/v1/workitems);
 	#b=${a:2:7};
 	echo $a;
 done
diff --git a/workitems/src/main/java/eu/dec21/wp/workitems/config/AuthConfig.java b/workitems/src/main/java/eu/dec21/wp/workitems/config/AuthConfig.java
deleted file mode 100644
index b3bc414..0000000
--- a/workitems/src/main/java/eu/dec21/wp/workitems/config/AuthConfig.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package eu.dec21.wp.workitems.config;
-
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class AuthConfig {
-
-}
diff --git a/workitems/src/main/java/eu/dec21/wp/workitems/controller/VersionController.java b/workitems/src/main/java/eu/dec21/wp/workitems/controller/VersionController.java
index a38fca0..051c368 100644
--- a/workitems/src/main/java/eu/dec21/wp/workitems/controller/VersionController.java
+++ b/workitems/src/main/java/eu/dec21/wp/workitems/controller/VersionController.java
@@ -2,6 +2,7 @@
 
 import eu.dec21.wp.model.Version;
 import eu.dec21.wp.workitems.service.WorkItemService;
+import eu.dec21.wp.workitems.service.impl.WorkItemServiceImpl;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -18,8 +19,7 @@
 @RestController
 @RequestMapping("/api/v1/version")
 public class VersionController {
-    @Autowired
-    private WorkItemService workItemService;
+    private final WorkItemService workItemService = new WorkItemServiceImpl();
     @Value("${application.version}")
     private String svcVer;
     @Value("${application.date}")
diff --git a/workitems/src/main/java/eu/dec21/wp/workitems/entity/WorkItem.java b/workitems/src/main/java/eu/dec21/wp/workitems/entity/WorkItem.java
index 2a47ba0..d8f3a21 100644
--- a/workitems/src/main/java/eu/dec21/wp/workitems/entity/WorkItem.java
+++ b/workitems/src/main/java/eu/dec21/wp/workitems/entity/WorkItem.java
@@ -3,6 +3,7 @@
 import com.github.javafaker.Address;
 import lombok.*;
 import com.github.javafaker.Faker;
+import java.util.Random;
 
 @Getter
 @Setter
@@ -10,7 +11,7 @@
 @AllArgsConstructor
 public class WorkItem {
 
-    private static Faker faker = new Faker();
+    private static Random random = new Random();
 
     private long id;
 
@@ -34,23 +35,22 @@ public class WorkItem {
 
     public static WorkItem generateWorkItem() {
         WorkItem workItem = new WorkItem();
-        workItem.setId(faker.random().nextLong());
-        workItem.setName(faker.app().name());
-        workItem.setDescription(faker.book().title());
-        Address address = faker.address();
-        workItem.setCountry(address.country());
-        workItem.setCity(address.city());
-        workItem.setAddress(address.fullAddress());
-        workItem.setAssignee(address.lastName() + " " + address.firstName());
-        workItem.setPoints(faker.number().numberBetween(1, 100));
-        workItem.setCost(faker.random().nextDouble());
-        workItem.setBlocked(faker.bool().bool());
+        workItem.setId(random.nextLong());
+        workItem.setName("Name" + random.nextLong());
+        workItem.setDescription("Description" + random.nextLong());
+        workItem.setCountry("Country" + random.nextLong());
+        workItem.setCity("City" + random.nextLong());
+        workItem.setAddress("Address" + random.nextLong());
+        workItem.setAssignee("Assignee" + random.nextLong());
+        workItem.setPoints(random.nextInt(100));
+        workItem.setCost(random.nextDouble());
+        workItem.setBlocked(random.nextBoolean());
         return workItem;
     }
 
     public long generateId() {
         if (  id == 0) {
-            id = faker.random().nextLong();
+            id = random.nextLong();
         }
         return id;
     }
diff --git a/workitems/src/main/java/eu/dec21/wp/workitems/repository/WorkItemRepository.java b/workitems/src/main/java/eu/dec21/wp/workitems/repository/WorkItemRepository.java
index 1e19b28..eb8e311 100644
--- a/workitems/src/main/java/eu/dec21/wp/workitems/repository/WorkItemRepository.java
+++ b/workitems/src/main/java/eu/dec21/wp/workitems/repository/WorkItemRepository.java
@@ -11,14 +11,22 @@
 
 @Repository
 public class WorkItemRepository {
+    @Value("${workitems.count}")
+    private String wrkItemCount;
 
     private ArrayList<WorkItem> workItems;
 
-    private Logger logger = LoggerFactory.getLogger(WorkItemRepository.class);
+    final private Logger logger = LoggerFactory.getLogger(WorkItemRepository.class);
 
-    WorkItemRepository(@Value("${workitems.count}") int wkrItmCnt) {
-        workItems = new ArrayList<>(wkrItmCnt);
-        for (int i = 0; i < wkrItmCnt; i++) {
+    public WorkItemRepository() {
+        int workItemCount;
+        try {
+            workItemCount = Integer.parseInt(this.wrkItemCount);
+        } catch (NumberFormatException e) {
+            workItemCount = 100;
+        }
+        workItems = new ArrayList<>(workItemCount);
+        for (int i = 0; i < workItemCount; i++) {
             workItems.add(WorkItem.generateWorkItem());
         }
     }
diff --git a/workitems/src/main/java/eu/dec21/wp/workitems/service/impl/WorkItemServiceImpl.java b/workitems/src/main/java/eu/dec21/wp/workitems/service/impl/WorkItemServiceImpl.java
index 4a5866b..4b45cae 100644
--- a/workitems/src/main/java/eu/dec21/wp/workitems/service/impl/WorkItemServiceImpl.java
+++ b/workitems/src/main/java/eu/dec21/wp/workitems/service/impl/WorkItemServiceImpl.java
@@ -8,6 +8,7 @@
 import eu.dec21.wp.workitems.repository.WorkItemRepository;
 import eu.dec21.wp.workitems.service.WorkItemService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -15,8 +16,7 @@
 
 @Service
 public class WorkItemServiceImpl implements WorkItemService {
-    @Autowired
-    private WorkItemRepository workItemRepository;
+    private WorkItemRepository workItemRepository = new WorkItemRepository();
 
 
     @Override