diff --git a/src/test/java/no/nibio/vips/logic/messaging/UniversalMessagingTest.java b/src/test/java/no/nibio/vips/logic/messaging/UniversalMessagingTest.java
index 5b2b464ea9d2596f597d980d004fd2a68cabd0e5..553e67bfccdbc986ee6eba939620ab285c41dc35 100755
--- a/src/test/java/no/nibio/vips/logic/messaging/UniversalMessagingTest.java
+++ b/src/test/java/no/nibio/vips/logic/messaging/UniversalMessagingTest.java
@@ -86,7 +86,7 @@ public class UniversalMessagingTest {
         }
     }
     
-    @Test
+    //@Test
     public void serviceTest()
     {
         System.out.println("serviceTest");
diff --git a/src/test/java/no/nibio/vips/logic/scheduling/model/preprocessor/BremiaLactucaeModelPreprocessorTest.java b/src/test/java/no/nibio/vips/logic/scheduling/model/preprocessor/BremiaLactucaeModelPreprocessorTest.java
index 3608eb9f1589c9f410467e2060433fe14bad86a2..f8e1c714c21289d8ff26fb4abff06e9bcb7d2fd8 100644
--- a/src/test/java/no/nibio/vips/logic/scheduling/model/preprocessor/BremiaLactucaeModelPreprocessorTest.java
+++ b/src/test/java/no/nibio/vips/logic/scheduling/model/preprocessor/BremiaLactucaeModelPreprocessorTest.java
@@ -62,7 +62,7 @@ public class BremiaLactucaeModelPreprocessorTest {
     /**
      * Test of getModelConfiguration method, of class BremiaLactucaeModelPreprocessor.
      */
-    @Test
+    //@Test
     public void testGetModelConfiguration() throws Exception {
         System.out.println("getModelConfiguration");
         ForecastConfiguration configuration = new ForecastConfiguration();
@@ -76,7 +76,7 @@ public class BremiaLactucaeModelPreprocessorTest {
         PointOfInterestWeatherStation station = new PointOfInterestWeatherStation();
         station.setTimeZone("Europe/Oslo");
         WeatherStationDataSource wsds = new WeatherStationDataSource();
-        wsds.setDatafetchUriExpression("http://lmt.bioforsk.no/agrometbase/export/getVIPS3JSONWeatherData.php?weatherStationId=%s");
+        wsds.setDatafetchUriExpression("https://lmt.nibio.no/services/rest/vips/getdata/forecastfallback?weatherStationId=%s");
         station.setWeatherStationDataSourceId(wsds);
         station.setWeatherStationRemoteId("30");
         configuration.setWeatherStationPointOfInterestId(station);
diff --git a/src/test/java/no/nibio/vips/logic/scheduling/model/preprocessor/PlasmoparaViticolaModelPreprocessorTest.java b/src/test/java/no/nibio/vips/logic/scheduling/model/preprocessor/PlasmoparaViticolaModelPreprocessorTest.java
index 907eb39536025f304fb517990273be963173dbf3..77099a86722590b65b2b5aea81801dc8a16ceb79 100755
--- a/src/test/java/no/nibio/vips/logic/scheduling/model/preprocessor/PlasmoparaViticolaModelPreprocessorTest.java
+++ b/src/test/java/no/nibio/vips/logic/scheduling/model/preprocessor/PlasmoparaViticolaModelPreprocessorTest.java
@@ -74,8 +74,8 @@ public class PlasmoparaViticolaModelPreprocessorTest {
         try
         {
 
-            URL weatherURL = new URL("http://www.robigus.ba/Vips/GetJsonWeatherData/11?logIntervalId=1&timeZone=Europe/Sarajevo&startDate=2015-01-01&startTime=0&endDate=2015-02-20&endTime=0&elementMeasurementTypes[]=TM&elementMeasurementTypes[]=RR");
-            //URL weatherURL = new URL("http://lmt.nibio.no/agrometbase/export/getVIPS3JSONWeatherData.php?weatherStationId=5&elementMeasurementTypes%5B%5D=TM&elementMeasurementTypes%5B%5D=UM&logInterval=1h&startDate=2015-01-01&startTime=00&endDate=2015-02-17&endTime=00&timeZone=Europe%2FOslo");
+            //URL weatherURL = new URL("http://www.robigus.ba/Vips/GetJsonWeatherData/11?logIntervalId=1&timeZone=Europe/Sarajevo&startDate=2015-01-01&startTime=0&endDate=2015-02-20&endTime=0&elementMeasurementTypes[]=TM&elementMeasurementTypes[]=RR");
+            URL weatherURL = new URL("https://lmt.nibio.no/services/rest/vips/getdata/forecastfallback?weatherStationId=5&elementMeasurementTypes[]=TM&elementMeasurementTypes[]=UM&logInterval=1h&startDate=2015-01-01&startTime=00&endDate=2015-02-17&endTime=00&timeZone=Europe/Oslo");
             URLConnection URLConn = weatherURL.openConnection();
             InputStream URLStream = URLConn.getInputStream();
             String URLOutput = IOUtils.toString(URLStream);