diff --git a/LesionTracker/.gagarin/.gitignore b/LesionTracker/.gagarin/.gitignore
new file mode 100644
index 000000000..408303742
--- /dev/null
+++ b/LesionTracker/.gagarin/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/LesionTracker/.meteor/nightwatch.json b/LesionTracker/.meteor/nightwatch.json
new file mode 100644
index 000000000..3ddebe60d
--- /dev/null
+++ b/LesionTracker/.meteor/nightwatch.json
@@ -0,0 +1,136 @@
+{
+  "starrynight": {
+    "version": "3.7.0"
+  },
+  "nightwatch": {
+    "version": "0.8.6"
+  },
+  "src_folders": [
+    "./tests/nightwatch/walkthroughs"
+  ],
+  "output_folder": "./tests/nightwatch/reports",
+  "custom_commands_path": [
+    "./tests/nightwatch/commands",
+    "./tests/nightwatch/commands/api/meteor",
+    "./tests/nightwatch/commands/actions",
+    "./tests/nightwatch/commands/components",
+    "./tests/nightwatch/commands/methods"
+  ],
+  "custom_assertions_path": [
+    "./tests/nightwatch/assertions"
+  ],
+  "globals_path": "./tests/nightwatch/globals.json",
+  "selenium": {
+    "start_process": true,
+    "server_path": "${npm_config_prefix}/lib/node_modules/starrynight/node_modules/selenium-server-standalone-jar/jar/selenium-server-standalone-2.45.0.jar",
+    "log_path": "tests/nightwatch/logs",
+    "host": "127.0.0.1",
+    "port": 4444,
+    "cli_args": {
+      "webdriver.chrome.driver": "${npm_config_prefix}/lib/node_modules/starrynight/node_modules/chromedriver/bin/chromedriver"
+    }
+  },
+  "test_settings": {
+    "default": {
+      "launch_url": "http://localhost:5000",
+      "selenium_host": "127.0.0.1",
+      "selenium_port": 4444,
+      "pathname": "/wd/hub",
+      "silent": true,
+      "disable_colors": false,
+      "firefox_profile": false,
+      "ie_driver": "",
+      "screenshots": {
+        "enabled": false,
+        "path": "./tests/nightwatch/screenshots"
+      },
+      "desiredCapabilities": {
+        "browserName": "chrome",
+        "javascriptEnabled": true,
+        "acceptSslCerts": true,
+        "loggingPrefs": {
+          "browser": "ALL"
+        }
+      },
+      "exclude": "./tests/nightwatch/unittests/*"
+    },
+    "phantomjs": {
+      "desiredCapabilities": {
+        "browserName": "phantomjs",
+        "javascriptEnabled": true,
+        "databaseEnabled": false,
+        "locationContextEnabled": false,
+        "applicationCacheEnabled": false,
+        "browserConnectionEnabled": false,
+        "webStorageEnabled": false,
+        "acceptSslCerts": true,
+        "rotatable": false,
+        "nativeEvents": false,
+        "phantomjs.binary.path": "${npm_config_prefix}/lib/node_modules/starrynight/node_modules/phantomjs/bin/phantomjs"
+      }
+    },
+    "travis": {
+      "launch_url": "http://localhost:3000",
+      "selenium_host": "127.0.0.1",
+      "selenium_port": 4444,
+      "pathname": "/wd/hub",
+      "silent": true,
+      "disable_colors": false,
+      "firefox_profile": false,
+      "screenshots": {
+        "enabled": false,
+        "path": "./tests/nightwatch/screenshots"
+      },
+      "desiredCapabilities": {
+        "browserName": "firefox",
+        "javascriptEnabled": true,
+        "databaseEnabled": true,
+        "locationContextEnabled": true,
+        "applicationCacheEnabled": true,
+        "browserConnectionEnabled": true,
+        "webStorageEnabled": true,
+        "acceptSslCerts": true,
+        "rotatable": true,
+        "nativeEvents": true
+      }
+    },
+    "travischrome": {
+      "launch_url": "http://localhost:3000",
+      "selenium_host": "127.0.0.1",
+      "selenium_port": 4444,
+      "pathname": "/wd/hub",
+      "silent": true,
+      "disable_colors": false,
+      "firefox_profile": false,
+      "screenshots": {
+        "enabled": false,
+        "path": "./tests/nightwatch/screenshots"
+      },
+      "desiredCapabilities": {
+        "browserName": "chrome",
+        "javascriptEnabled": true,
+        "databaseEnabled": true,
+        "locationContextEnabled": true,
+        "applicationCacheEnabled": true,
+        "browserConnectionEnabled": true,
+        "webStorageEnabled": true,
+        "acceptSslCerts": true,
+        "rotatable": true,
+        "nativeEvents": true,
+        "chromeOptions": {
+          "args": [
+            "--no-sandbox"
+          ]
+        }
+      }
+    },
+    "unittests": {
+      "selenium": {
+        "start_process": false,
+        "start_session": false
+      },
+      "filter": "./tests/nightwatch/unittests/*",
+      "exclude": ""
+    }
+  }
+}
diff --git a/LesionTracker/.meteor/packages b/LesionTracker/.meteor/packages
index 142f41d60..42be79925 100644
--- a/LesionTracker/.meteor/packages
+++ b/LesionTracker/.meteor/packages
@@ -47,3 +47,5 @@ clinical:theming-ui
 clinical:fonts
 clinical:glass-ui
 clinical:hipaa-logger
+anti:gagarin@=0.4.11
+check
diff --git a/LesionTracker/.meteor/versions b/LesionTracker/.meteor/versions
index a8cf32829..71f4529fb 100644
--- a/LesionTracker/.meteor/versions
+++ b/LesionTracker/.meteor/versions
@@ -1,5 +1,6 @@
 accounts-base@1.2.2
 accounts-password@1.1.4
+anti:gagarin@0.4.11
 anti:i18n@0.4.3
 arsnebula:reactive-promise@0.9.1
 autoupdate@1.2.4
diff --git a/LesionTracker/defaultSettings.js b/LesionTracker/defaultSettings.js
new file mode 100644
index 000000000..f630cd9a3
--- /dev/null
+++ b/LesionTracker/defaultSettings.js
@@ -0,0 +1,30 @@
+Meteor.startup(function() {
+    if (Meteor.settings.dicomWeb) {
+        console.log('dicomWeb settings defined!');
+        console.log(Meteor.settings);
+        return;
+    }
+
+    console.log('Using default LesionTracker dicomWeb settings');
+    Meteor.settings = {
+      "dicomWeb" : {
+        "endpoints": [
+          {
+            "name": "Orthanc",
+            "wadoUriRootNOTE" : "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently",
+            "wadoUriRoot" : "http://localhost:8043/wado",
+            "qidoRoot": "http://localhost:8042/dicom-web",
+            "wadoRoot": "http://localhost:8042/dicom-web",
+            "qidoSupportsIncludeField": false,
+            "imageRendering" : "wadouri",
+            "requestOptions" : {
+              "auth": "orthanc:orthanc",
+              "logRequests" : true,
+              "logResponses" : false,
+              "logTiming" : true
+            }
+          }
+        ]
+      }
+    };
+});
\ No newline at end of file
diff --git a/LesionTracker/runGagarinTests.sh b/LesionTracker/runGagarinTests.sh
new file mode 100755
index 000000000..b5cc0d3a0
--- /dev/null
+++ b/LesionTracker/runGagarinTests.sh
@@ -0,0 +1 @@
+starrynight run-tests --framework gagarin --debug --verbose --webdriver http://localhost:9515 --path ../Packages/*/tests/gagarin/**/*.js
\ No newline at end of file
diff --git a/LesionTracker/runNightwatchTests.sh b/LesionTracker/runNightwatchTests.sh
new file mode 100755
index 000000000..12c028e31
--- /dev/null
+++ b/LesionTracker/runNightwatchTests.sh
@@ -0,0 +1 @@
+starrynight run-tests --framework nightwatch
\ No newline at end of file
diff --git a/Packages/viewerbase/server/methods/worklistSearch.js b/Packages/viewerbase/server/methods/worklistSearch.js
index d22cd8a3c..fae4446da 100644
--- a/Packages/viewerbase/server/methods/worklistSearch.js
+++ b/Packages/viewerbase/server/methods/worklistSearch.js
@@ -4,6 +4,11 @@ Meteor.methods({
      * @param filter
      */
     'WorklistSearch': function(filter) {
+        if (!Meteor.settings.dicomWeb) {
+            console.warn('No dicomWeb settings provided! Worklist search is not possible!')
+            return;
+        }
+        
         // Get the server data. This is user-defined in the
         // config.json files used to run the Meteor server
         var server = Meteor.settings.dicomWeb.endpoints[0];