diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 78d92f6..6d7fe6b 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 #
-#Fri Nov 27 11:43:12 CET 2015
+#Fri Nov 27 16:17:06 CET 2015
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff --git a/src/main/java/ch/psi/daq/queryrest/QueryRestApplication.java b/src/main/java/ch/psi/daq/queryrest/QueryRestApplication.java
index 142d6f1..b79dd7d 100644
--- a/src/main/java/ch/psi/daq/queryrest/QueryRestApplication.java
+++ b/src/main/java/ch/psi/daq/queryrest/QueryRestApplication.java
@@ -12,7 +12,6 @@ import org.springframework.boot.context.web.SpringBootServletInitializer;
 @SpringBootApplication
 public class QueryRestApplication extends SpringBootServletInitializer {
 
-
    public static void main(final String[] args) {
       SpringApplication.run(QueryRestApplication.class, args);
    }
diff --git a/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java b/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
index fd712db..85b7848 100644
--- a/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
+++ b/src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java
@@ -25,7 +25,12 @@ import org.springframework.util.StringUtils;
 import org.springframework.validation.Validator;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
-import ch.psi.daq.cassandra.util.test.CassandraDataGen;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
 import ch.psi.daq.common.statistic.StorelessStatistics;
 import ch.psi.daq.domain.DataEvent;
 import ch.psi.daq.query.analyzer.QueryAnalyzer;
@@ -41,12 +46,6 @@ import ch.psi.daq.queryrest.response.JsonByteArraySerializer;
 import ch.psi.daq.queryrest.response.JsonStreamSerializer;
 import ch.psi.daq.queryrest.response.ResponseStreamWriter;
 
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-
 @Configuration
 @PropertySource(value = {"classpath:queryrest.properties"})
 @PropertySource(value = {"file:${user.home}/.config/daq/queryrest.properties"}, ignoreResourceNotFound = true)
@@ -72,7 +71,7 @@ public class QueryRestConfig extends WebMvcConfigurerAdapter {
 
    @Resource
    private Environment env;
-   
+
    @Resource
    private ObjectMapper objectMapper;
 
@@ -176,11 +175,4 @@ public class QueryRestConfig extends WebMvcConfigurerAdapter {
    public Filter corsFilter() {
       return new CorsFilter();
    }
-
-   // ==========================================================================================
-   // TODO: This is simply for initial / rudimentary testing - remove once further evolved
-   @Bean
-   public CassandraDataGen cassandraDataGen() {
-      return new CassandraDataGen();
-   }
 }
diff --git a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
index aa20635..3127e39 100644
--- a/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
+++ b/src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java
@@ -27,8 +27,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.google.common.collect.Lists;
+
 import ch.psi.daq.cassandra.request.validate.RequestProviderValidator;
-import ch.psi.daq.cassandra.util.test.CassandraDataGen;
 import ch.psi.daq.common.concurrent.singleton.Deferred;
 import ch.psi.daq.common.json.deserialize.AttributeBasedDeserializer;
 import ch.psi.daq.common.ordering.Ordering;
@@ -46,8 +47,6 @@ import ch.psi.daq.query.request.ChannelsRequest;
 import ch.psi.daq.queryrest.config.QueryRestConfig;
 import ch.psi.daq.queryrest.response.ResponseStreamWriter;
 
-import com.google.common.collect.Lists;
-
 @RestController
 public class QueryRestController {
 
@@ -248,26 +247,4 @@ public class QueryRestController {
          throw new IllegalArgumentException(String.format("Unknown DBMode '%s'", dbMode));
       }
    }
-
-   // ==========================================================================================
-   // TODO: This is simply for initial / rudimentary testing - remove once
-   // further evolved
-
-   @Resource
-   private CassandraDataGen cassandraDataGen;
-
-   @RequestMapping(value = "/write")
-   public void writeDummyEntry() {
-      long nrOfElements = 4;
-      cassandraDataGen.writeData(3, 0, 4, i -> i, i -> 0, i -> i, i -> i, i -> 0, i -> new long[] {i, i, i, i},
-            "TRFCA-channel1");
-
-      cassandraDataGen.writeData(3, 0, 4, i -> i, i -> 0, i -> i, i -> i, i -> 0, i -> new long[] {nrOfElements - i,
-            nrOfElements - i, nrOfElements - i, nrOfElements - i}, "TRFCA-channel2");
-
-      cassandraDataGen.writeData(3, 0, 4, i -> i, i -> 0, i -> i, i -> i, i -> 0, i -> i, "TRFCB-channel3");
-
-      cassandraDataGen.writeData(3, 0, 4, i -> i, i -> 0, i -> i, i -> i, i -> 0, i -> nrOfElements - i,
-            "TRFCB-channel4");
-   }
 }
diff --git a/src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java b/src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
index bbfdad5..4ec664f 100644
--- a/src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
+++ b/src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
@@ -4,6 +4,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -32,15 +33,19 @@ public class DaqWebMvcConfig extends WebMvcConfigurationSupport {
    }
    
    @Bean
+   @Lazy
    public QueryProcessor cassandraQueryProcessorLocal() {
       return new QueryProcessorLocal(cassandraReader());
    }
    
-   @Bean CassandraReader cassandraReader() {
+   @Bean
+   @Lazy
+   CassandraReader cassandraReader() {
       return new DummyCassandraReader();
    }
    
    @Bean
+   @Lazy
    public CassandraTestAdmin cassandraTestAdmin() {
       return new CassandraTestAdminImpl();
    }