diff --git a/software/app/application.cpp b/software/app/application.cpp
index 3e77d6d..382a302 100644
--- a/software/app/application.cpp
+++ b/software/app/application.cpp
@@ -13,6 +13,8 @@
 #include "signal_process.h"
 #include "sensor_hub.h"
 
+#include "tests.h"
+
 using namespace rijnfel;
 
 void STADisconnect(String ssid, uint8_t ssid_len, uint8_t bssid[6], uint8_t reason);
@@ -37,26 +39,6 @@ void ChangeSampleChannel(int channel) {
 	}
 }
 
-void SettingsTest() {
-	channel++;
-	if (channel > 3) {
-		channel = 0;
-		cWebInterface::GetInstance()->PrintValues();
-	}
-	ads1015.SetMux(static_cast<ads::eInputMux>(ads::eInputMux::AIN_0 + channel));
-	Serial.printf("Settings: %d\n\r", ads1015.GetSettings());
-}
-
-void AdcTest() {
-	channel++;
-	if (channel > 3) {
-		channel = 0;
-	}
-	ads1015.SetMux(static_cast<ads::eInputMux>(ads::eInputMux::AIN_0 + channel));
-	ads::ads_sample_t sample = ads1015.RawSample();
-	Serial.printf("raw: %d converted: %d channel: %d\n\r", sample.rawSample, ads1015.ConvertSample(sample), sample.mux);
-}
-
 void updateSensorHub() {
 	WDT.alive();
 	hub.Update();
@@ -64,10 +46,7 @@ void updateSensorHub() {
 
 void ready() {
 	WifiAccessPoint.config("Sensus", "", AUTH_OPEN, false, 3);
-	//debugf("READY!");
-
-	// If AP is enabled:
-	//debugf("AP. ip: %s mac: %s", WifiAccessPoint.getIP().toString().c_str(), WifiAccessPoint.getMAC().c_str());
+	hub.Start();
 }
 
 void init() {
@@ -115,12 +94,6 @@ void init() {
 	cWebInterface::GetInstance()->StartServer();
 
 	procTimer.initializeMs(HUB_PERIOD, updateSensorHub).start();
-
-	hub.Start();
-	//procTimer.initializeMs(1000, AdcTest).start();
-	//procTimer.initializeMs(5000, SettingsTest).start();
-	//mylight.SetCurrent(5000);
-	//mylight.RectangleUpdate();	
 }
 
 void STADisconnect(String ssid, uint8_t ssid_len, uint8_t bssid[6], uint8_t reason) {
@@ -135,5 +108,4 @@ void STAGotIP(IPAddress ip, IPAddress mask, IPAddress gateway) {
 	if (WifiAccessPoint.isEnabled()) {
 		WifiAccessPoint.enable(false);
 	}
-	// Add commands to be executed after successfully connecting to AP and got IP from it
 }
diff --git a/software/app/test.cpp b/software/app/test.cpp
new file mode 100644
index 0000000..0f8b403
--- /dev/null
+++ b/software/app/test.cpp
@@ -0,0 +1,24 @@
+/*
+ * test.cpp
+ *
+ *  Created on: Aug 23, 2017
+ *      Author: Elmar
+ */
+
+#include <SmingCore/HardwareSerial.h>
+#include "tests.h"
+
+void SettingsTest(rijnfel::ads::cADS101x * ads1015) {
+	for (int channel = 0; channel < 4; channel++) {
+		ads1015->SetMux(static_cast<rijnfel::ads::eInputMux>(rijnfel::ads::eInputMux::AIN_0 + channel));
+		Serial.printf("Settings: %d\n\r", ads1015->GetSettings());
+	}
+}
+
+void AdcTest(rijnfel::ads::cADS101x * ads1015) {
+	for (int channel = 0; channel < 4; channel++) {
+		ads1015->SetMux(static_cast<rijnfel::ads::eInputMux>(rijnfel::ads::eInputMux::AIN_0 + channel));
+		rijnfel::ads::ads_sample_t sample = ads1015->RawSample();
+		Serial.printf("converted: %d channel: %d\n\r", ads1015->ConvertSample(sample), sample.mux);
+	}
+}
diff --git a/software/app/tests.h b/software/app/tests.h
new file mode 100644
index 0000000..1666d68
--- /dev/null
+++ b/software/app/tests.h
@@ -0,0 +1,17 @@
+/*
+ * tests.h
+ *
+ *  Created on: Aug 23, 2017
+ *      Author: Elmar
+ */
+
+#ifndef APP_TESTS_H_
+#define APP_TESTS_H_
+
+#include "ads101x.h"
+#include "dac101c085.h"
+
+void SettingsTest(rijnfel::ads::cADS101x ads1015);
+void AdcTest(rijnfel::ads::cADS101x * ads1015);
+
+#endif /* APP_TESTS_H_ */