diff --git a/src/main/java/dev/joordih/zenmap/Zenmap.java b/src/main/java/dev/joordih/zenmap/Zenmap.java
index 7b69232..46ae30f 100644
--- a/src/main/java/dev/joordih/zenmap/Zenmap.java
+++ b/src/main/java/dev/joordih/zenmap/Zenmap.java
@@ -17,6 +17,8 @@ public class Zenmap {
 
   private final ProviderManager providerManager;
 
+  private final NodeManager nodeManager;
+
 
   public Zenmap() {
     instance = this;
@@ -35,11 +37,16 @@ public Zenmap() {
     this.providerManager.loadProviders();
 
     System.out.println("Instancing and loading nodes...");
-    new NodeManager();
+    this.nodeManager = new NodeManager();
+  }
+
+  public void runTests() {
+    this.nodeManager.runAllTests();
   }
 
   public static void main(String[] args) {
-    new Zenmap();
+    Zenmap app = new Zenmap();
+    app.runTests();
 
     Thread keepAliveThread = new Thread(() -> {
       while (true) {
diff --git a/src/main/java/dev/joordih/zenmap/managers/nodes/NodeManager.java b/src/main/java/dev/joordih/zenmap/managers/nodes/NodeManager.java
index 91338a6..fd1436e 100644
--- a/src/main/java/dev/joordih/zenmap/managers/nodes/NodeManager.java
+++ b/src/main/java/dev/joordih/zenmap/managers/nodes/NodeManager.java
@@ -1,14 +1,9 @@
 package dev.joordih.zenmap.managers.nodes;
 
-import com.google.common.collect.Lists;
 import dev.joordih.zenmap.managers.nodes.city.City;
-import dev.joordih.zenmap.managers.nodes.city.CityStrategy;
 import dev.joordih.zenmap.managers.nodes.intersection.Intersection;
-import dev.joordih.zenmap.managers.nodes.intersection.IntersectionStrategy;
 import dev.joordih.zenmap.managers.nodes.lane.Lane;
-import dev.joordih.zenmap.managers.nodes.lane.LaneStrategy;
 import dev.joordih.zenmap.managers.nodes.track.Track;
-import dev.joordih.zenmap.managers.nodes.track.TrackStrategy;
 import dev.joordih.zenmap.managers.providers.impl.Neo4jProvider;
 import dev.joordih.zenmap.managers.repository.NeoObjectRepository;
 import dev.joordih.zenmap.managers.service.RouteService;
@@ -17,7 +12,6 @@
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 
 public class NodeManager {
 
@@ -27,38 +21,13 @@ public class NodeManager {
   private final NeoObjectRepository<Intersection> intersectionRepository;
   private final RouteService routeService;
 
-  private void initializeStrategyIfEmpty(Collection<?> collection, Runnable strategyInitializer, String strategyName) {
-    if (collection.isEmpty()) {
-      strategyInitializer.run();
-      System.out.println(strategyName + " initialized.");
-    }
-  }
-
   public NodeManager() {
-    Neo4jProvider provider = new Neo4jProvider();
     Session session = Neo4jProvider.getSessionFactory().openSession();
     this.laneRepository = new NeoObjectRepository<>(session, Lane.class);
     this.cityRepository = new NeoObjectRepository<>(session, City.class);
     this.trackRepository = new NeoObjectRepository<>(session, Track.class);
     this.intersectionRepository = new NeoObjectRepository<>(session, Intersection.class);
     this.routeService = new RouteService();
-
-    Collection<City> cities = Optional.ofNullable(this.cityRepository.findAll()).orElse(Lists.newArrayList());
-    Collection<Lane> lanes = Optional.ofNullable(this.laneRepository.findAll()).orElse(Lists.newArrayList());
-    Collection<Track> tracks = Optional.ofNullable(this.trackRepository.findAll()).orElse(Lists.newArrayList());
-    Collection<Intersection> intersections = Optional.ofNullable(this.intersectionRepository.findAll()).orElse(Lists.newArrayList());
-
-    System.out.println("Cities: " + cities.size());
-    System.out.println("Lanes: " + lanes.size());
-    System.out.println("Tracks: " + tracks.size());
-    System.out.println("Intersections: " + intersections.size());
-
-    initializeStrategyIfEmpty(cities, () -> new CityStrategy(provider, session), "Cities");
-    initializeStrategyIfEmpty(lanes, () -> new LaneStrategy(provider, session, cities), "Lanes");
-    initializeStrategyIfEmpty(tracks, () -> new TrackStrategy(provider, session, lanes), "Tracks");
-    initializeStrategyIfEmpty(intersections, () -> new IntersectionStrategy(provider, session, tracks), "Intersections");
-  
-    runAllTests();
   }
 
   public void testUpdateDirections() {