diff --git a/cellar-app/src/main/java/nl/lengrand/CellarMonitor.java b/cellar-app/src/main/java/nl/lengrand/CellarMonitor.java
index c4907d9..0409f01 100644
--- a/cellar-app/src/main/java/nl/lengrand/CellarMonitor.java
+++ b/cellar-app/src/main/java/nl/lengrand/CellarMonitor.java
@@ -9,26 +9,16 @@ public class CellarMonitor {
     private static final int THREADS = 1;
     private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(THREADS);
 
-    // From config
     private static final long START = 0;
     private static final long SPAN = 30;
     private static final TimeUnit UNIT = TimeUnit.MINUTES;
 
     private ScheduledFuture monitorHandle;
 
-    // How to use that exactly?
     private CellarProvider provider = new CellarProvider();
     private SensorApi faunaApi = new SensorApi();
 
-    final Runnable monitoring = () -> {
-        try {
-            faunaApi.add(provider.getSensorValues());
-        } catch (ExecutionException | InterruptedException e) {
-            e.printStackTrace();
-            System.out.println("Error add fauna data");
-            System.exit(0);
-        }
-    };
+    final Runnable monitoring = () -> { faunaApi.add(provider.getSensorValues()); };
 
     public void startMonitoring(){
         monitorHandle = scheduler.scheduleAtFixedRate(monitoring, START, SPAN, UNIT);
diff --git a/cellar-app/src/test/java/nl/lengrand/MainTest.java b/cellar-app/src/test/java/nl/lengrand/MainTest.java
deleted file mode 100644
index cad14b7..0000000
--- a/cellar-app/src/test/java/nl/lengrand/MainTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package nl.lengrand;
-
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.spi.CDI;
-import javax.json.JsonObject;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import io.helidon.microprofile.server.Server;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-class MainTest {
-    private static Server server;
-
-    @BeforeAll
-    public static void startTheServer() throws Exception {
-        server = Main.startServer();
-    }
-
-    @Test
-    void testHelloWorld() {
-
-        Client client = ClientBuilder.newClient();
-
-        JsonObject jsonObject = client
-                .target(getConnectionString("/greet"))
-                .request()
-                .get(JsonObject.class);
-        Assertions.assertEquals("Hello World!", jsonObject.getString("message"),
-                "default message");
-
-        jsonObject = client
-                .target(getConnectionString("/greet/Joe"))
-                .request()
-                .get(JsonObject.class);
-        Assertions.assertEquals("Hello Joe!", jsonObject.getString("message"),
-                "hello Joe message");
-
-        Response r = client
-                .target(getConnectionString("/greet/greeting"))
-                .request()
-                .put(Entity.entity("{\"greeting\" : \"Hola\"}", MediaType.APPLICATION_JSON));
-        Assertions.assertEquals(204, r.getStatus(), "PUT status code");
-
-        jsonObject = client
-                .target(getConnectionString("/greet/Jose"))
-                .request()
-                .get(JsonObject.class);
-        Assertions.assertEquals("Hola Jose!", jsonObject.getString("message"),
-                "hola Jose message");
-
-        r = client
-                .target(getConnectionString("/metrics"))
-                .request()
-                .get();
-        Assertions.assertEquals(200, r.getStatus(), "GET metrics status code");
-
-        r = client
-                .target(getConnectionString("/health"))
-                .request()
-                .get();
-        Assertions.assertEquals(200, r.getStatus(), "GET health status code");
-    }
-
-    @AfterAll
-    static void destroyClass() {
-        CDI<Object> current = CDI.current();
-        ((SeContainer) current).close();
-    }
-
-    private String getConnectionString(String path) {
-        return "http://localhost:" + server.port() + path;
-    }
-}