Return future from launcher starting

src/main/java/org/folio/circulation/Launcher.java

@@ -36,7 +36,7 @@ public static void main(String[] args) throws
 
     Integer port = Integer.getInteger("port", 9801);
 
-    launcher.start(port);
+    launcher.start(port).get(10, TimeUnit.SECONDS);
   }
 
   private void stop() {
@@ -51,10 +51,7 @@ public CompletableFuture<Void> undeploy() {
     return vertxAssistant.undeployVerticle(moduleDeploymentId);
   }
 
-  public void start(Integer port) throws
-    InterruptedException,
-    ExecutionException,
-    TimeoutException {
+  public CompletableFuture<Void> start(Integer port) {
 
     if(port == null) {
       throw new IllegalArgumentException("port should not be null");
@@ -70,8 +67,8 @@ public void start(Integer port) throws
     CompletableFuture<String> deployed =
       vertxAssistant.deployVerticle(CirculationVerticle.class, config);
 
-    deployed.thenAccept(result -> log.info("Server Started"));
-
-    moduleDeploymentId = deployed.get(10, TimeUnit.SECONDS);
+    return deployed
+      .thenApply(result -> moduleDeploymentId = result)
+      .thenAccept(result -> log.info("Server Started"));
   }
 }

src/test/java/api/APITestSuite.java

@@ -257,10 +257,13 @@ public static void before()
     } else {
       fakeStorageModuleDeployed = CompletableFuture.completedFuture(null);
     }
-
-    launcher.start(port);
 
-    fakeOkapiDeploymentId = fakeStorageModuleDeployed.get(10, TimeUnit.SECONDS);
+    final CompletableFuture<Void> circulationModuleStarted = launcher.start(port);
+
+    fakeStorageModuleDeployed.thenAccept(result -> fakeOkapiDeploymentId = result);
+
+    CompletableFuture.allOf(circulationModuleStarted, fakeStorageModuleDeployed)
+      .get(10, TimeUnit.SECONDS);
 
     createMaterialTypes();
     createLoanTypes();