diff --git a/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/FrameworkInfoFactory.java b/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/FrameworkInfoFactory.java
index 3da8b153..ef3f2571 100644
--- a/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/FrameworkInfoFactory.java
+++ b/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/FrameworkInfoFactory.java
@@ -29,7 +29,7 @@ public Protos.FrameworkInfo.Builder getBuilder() {
         return frameworkBuilder;
     }
 
-    private void setFrameworkId( Protos.FrameworkInfo.Builder frameworkBuilder) {
+    private void setFrameworkId (Protos.FrameworkInfo.Builder frameworkBuilder) {
         Protos.FrameworkID frameworkID = configuration.getFrameworkId(); // DCOS certification 02
         if (frameworkID != null && !frameworkID.getValue().isEmpty()) {
             LOGGER.info("Found previous frameworkID: " + frameworkID);
diff --git a/scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/FrameworkInfoFactoryTest.java b/scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/FrameworkInfoFactoryTest.java
index 241f31a1..f8f514e1 100644
--- a/scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/FrameworkInfoFactoryTest.java
+++ b/scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/FrameworkInfoFactoryTest.java
@@ -3,7 +3,7 @@
 import org.apache.mesos.Protos;
 import org.junit.Test;
 
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -15,13 +15,13 @@ public class FrameworkInfoFactoryTest {
     public static final int DUMMY_PORT = 1234;
 
     @Test
-public void shouldGetBuilder() {
-    Configuration configuration = mock(Configuration.class);
-    when(configuration.getFrameworkName()).thenReturn("TestFrameworkName");
-    when(configuration.getManagementApiPort()).thenReturn(DUMMY_PORT);
-    FrameworkInfoFactory frameworkInfoFactory = new FrameworkInfoFactory(configuration);
-    Protos.FrameworkInfo frameworkInfo = frameworkInfoFactory.getBuilder().build();
-    assertTrue(frameworkInfo.getWebuiUrl().contains("http://"));
-    assertTrue(frameworkInfo.getWebuiUrl().contains(Integer.toString(DUMMY_PORT)));
-}
+    public void shouldGetBuilder() {
+        Configuration configuration = mock(Configuration.class);
+        when(configuration.getFrameworkName()).thenReturn("TestFrameworkName");
+        when(configuration.getManagementApiPort()).thenReturn(DUMMY_PORT);
+        FrameworkInfoFactory frameworkInfoFactory = new FrameworkInfoFactory(configuration);
+        Protos.FrameworkInfo frameworkInfo = frameworkInfoFactory.getBuilder().build();
+        assertTrue(frameworkInfo.getWebuiUrl().contains("http://"));
+        assertTrue(frameworkInfo.getWebuiUrl().contains(Integer.toString(DUMMY_PORT)));
+    }
 }
\ No newline at end of file
diff --git a/system-test/src/systemTest/java/org/apache/mesos/elasticsearch/systemtest/DataVolumesSystemTest.java b/system-test/src/systemTest/java/org/apache/mesos/elasticsearch/systemtest/DataVolumesSystemTest.java
new file mode 100644
index 00000000..2030867a
--- /dev/null
+++ b/system-test/src/systemTest/java/org/apache/mesos/elasticsearch/systemtest/DataVolumesSystemTest.java
@@ -0,0 +1,50 @@
+package org.apache.mesos.elasticsearch.systemtest;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+import org.json.JSONObject;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests data volumes
+ */
+public class DataVolumesSystemTest extends TestBase {
+
+    public static final Logger LOGGER = Logger.getLogger(DiscoverySystemTest.class);
+
+    @Test
+    public void testDataVolumes() {
+        ElasticsearchSchedulerContainer scheduler = getScheduler();
+
+        TasksResponse tasksResponse = new TasksResponse(scheduler.getIpAddress(), NODE_COUNT);
+
+        List<JSONObject> tasks = tasksResponse.getTasks();
+
+        ElasticsearchNodesResponse nodesResponse = new ElasticsearchNodesResponse(tasks, NODE_COUNT);
+        assertTrue("Elasticsearch nodes did not discover each other within 5 minutes", nodesResponse.isDiscoverySuccessful());
+
+        try (InputStream inputstream = CONFIG.dockerClient.copyFileFromContainerCmd(CLUSTER.getMesosContainer().getContainerId(), "/var/lib/elasticsearch/mesos-elasticsearch").withHostPath("/tmp").exec()) {
+            String contents = IOUtils.toString(inputstream);
+            inputstream.close();
+            assertTrue(contents.contains("mesos-elasticsearch/nodes"));
+            assertTrue(contents.contains("mesos-elasticsearch/nodes/0"));
+            assertTrue(contents.contains("mesos-elasticsearch/nodes/0/_state"));
+            assertTrue(contents.contains("mesos-elasticsearch/nodes/0/node.lock"));
+            assertTrue(contents.contains("mesos-elasticsearch/nodes/1"));
+            assertTrue(contents.contains("mesos-elasticsearch/nodes/1/_state"));
+            assertTrue(contents.contains("mesos-elasticsearch/nodes/1/node.lock"));
+            assertTrue(contents.contains("mesos-elasticsearch/nodes/2"));
+            assertTrue(contents.contains("mesos-elasticsearch/nodes/2/_state"));
+            assertTrue(contents.contains("mesos-elasticsearch/nodes/2/node.lock"));
+        } catch (IOException e) {
+            LOGGER.error("Could not copy /var/lib/elasticsearch/mesos-elasticsearch from Mesos-Local container");
+        }
+    }
+
+}
diff --git a/system-test/src/systemTest/java/org/apache/mesos/elasticsearch/systemtest/DiscoverySystemTest.java b/system-test/src/systemTest/java/org/apache/mesos/elasticsearch/systemtest/DiscoverySystemTest.java
index e2ea475b..7e0e916f 100644
--- a/system-test/src/systemTest/java/org/apache/mesos/elasticsearch/systemtest/DiscoverySystemTest.java
+++ b/system-test/src/systemTest/java/org/apache/mesos/elasticsearch/systemtest/DiscoverySystemTest.java
@@ -1,12 +1,9 @@
 package org.apache.mesos.elasticsearch.systemtest;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 
 import static org.junit.Assert.assertTrue;
@@ -28,23 +25,6 @@ public void testNodeDiscoveryRest() {
 
         ElasticsearchNodesResponse nodesResponse = new ElasticsearchNodesResponse(tasks, NODE_COUNT);
         assertTrue("Elasticsearch nodes did not discover each other within 5 minutes", nodesResponse.isDiscoverySuccessful());
-
-        try (InputStream inputstream = CONFIG.dockerClient.copyFileFromContainerCmd(CLUSTER.getMesosContainer().getContainerId(), "/var/lib/elasticsearch/mesos-elasticsearch").withHostPath("/tmp").exec()) {
-            String contents = IOUtils.toString(inputstream);
-            inputstream.close();
-            assertTrue(contents.contains("mesos-elasticsearch/nodes"));
-            assertTrue(contents.contains("mesos-elasticsearch/nodes/0"));
-            assertTrue(contents.contains("mesos-elasticsearch/nodes/0/_state"));
-            assertTrue(contents.contains("mesos-elasticsearch/nodes/0/node.lock"));
-            assertTrue(contents.contains("mesos-elasticsearch/nodes/1"));
-            assertTrue(contents.contains("mesos-elasticsearch/nodes/1/_state"));
-            assertTrue(contents.contains("mesos-elasticsearch/nodes/1/node.lock"));
-            assertTrue(contents.contains("mesos-elasticsearch/nodes/2"));
-            assertTrue(contents.contains("mesos-elasticsearch/nodes/2/_state"));
-            assertTrue(contents.contains("mesos-elasticsearch/nodes/2/node.lock"));
-        } catch (IOException e) {
-            LOGGER.error("Could not copy /var/lib/elasticsearch/mesos-elasticsearch from Mesos-Local container");
-        }
    }
 
 }