diff --git a/guh.pro b/guh.pro
index 217a5710..ea5d323d 100644
--- a/guh.pro
+++ b/guh.pro
@@ -45,6 +45,14 @@ coverage {
     message("Building coverage.")
 }
 
+# Build tests
+!disabletesting {
+    message("Building guh with tests")
+    SUBDIRS += tests
+} else {
+    message("Building guh without tests")
+}
+
 # Bluetooth LE support
 contains(DEFINES, BLUETOOTH_LE) {
     message("Bluetooth LE enabled.")
diff --git a/plugins/deviceplugins/datetime/deviceplugindatetime.cpp b/plugins/deviceplugins/datetime/deviceplugindatetime.cpp
index 8b3e1f8e..c6d0e67e 100644
--- a/plugins/deviceplugins/datetime/deviceplugindatetime.cpp
+++ b/plugins/deviceplugins/datetime/deviceplugindatetime.cpp
@@ -225,7 +225,7 @@ void DevicePluginDateTime::deviceRemoved(Device *device)
         countdown->deleteLater();
     }
 
-    startMonitoringAutoDevices();
+    //startMonitoringAutoDevices();
 }
 
 DeviceManager::DeviceError DevicePluginDateTime::executeAction(Device *device, const Action &action)
@@ -271,14 +271,14 @@ void DevicePluginDateTime::networkManagerReplyReady(QNetworkReply *reply)
 
 void DevicePluginDateTime::startMonitoringAutoDevices()
 {
-    foreach (Device *device, myDevices()) {
-        if (device->deviceClassId() == todayDeviceClassId) {
-            return; // We already have the date device... do nothing.
-        }
-    }
+//    foreach (Device *device, myDevices()) {
+//        if (device->deviceClassId() == todayDeviceClassId) {
+//            return; // We already have the date device... do nothing.
+//        }
+//    }
 
-    DeviceDescriptor dateDescriptor(todayDeviceClassId, "Date", "Time");
-    emit autoDevicesAppeared(todayDeviceClassId, QList<DeviceDescriptor>() << dateDescriptor);
+//    DeviceDescriptor dateDescriptor(todayDeviceClassId, "Date", "Time");
+//    emit autoDevicesAppeared(todayDeviceClassId, QList<DeviceDescriptor>() << dateDescriptor);
 }
 
 void DevicePluginDateTime::searchGeoLocation()
diff --git a/plugins/deviceplugins/datetime/deviceplugindatetime.json b/plugins/deviceplugins/datetime/deviceplugindatetime.json
index 0a519176..172be0dd 100644
--- a/plugins/deviceplugins/datetime/deviceplugindatetime.json
+++ b/plugins/deviceplugins/datetime/deviceplugindatetime.json
@@ -17,7 +17,7 @@
                         "Service",
                         "Time"
                     ],
-                    "createMethods": ["auto"],
+                    "createMethods": ["user"],
                     "paramTypes": [ ],
                     "stateTypes": [
                         {