diff --git a/appveyor.yml b/appveyor.yml
index d9ef393..258b330 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,13 +17,13 @@ matrix:
 
 environment: 
   matrix:
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-    GENERATOR: "Visual Studio 10 2010"
-    GROUP: "SUPPORTED"
-    BOOST_ROOT: "C:/Libraries/boost"
-  # New build on Visual Studio 15 2017
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     GENERATOR: "Visual Studio 15 2017"
+    GROUP: "SUPPORTED"
+    BOOST_ROOT: "C:/Libraries/boost_1_67_0"
+  # New build on Visual Studio 15 2017
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    GENERATOR: "Visual Studio 15 2017 Win64"
     GROUP: "EXPERIMENTAL"
     BOOST_ROOT: "C:/Libraries/boost_1_67_0"
 
diff --git a/tools/before-test.cmd b/tools/before-test.cmd
index 8871b44..70a7af9 100644
--- a/tools/before-test.cmd
+++ b/tools/before-test.cmd
@@ -25,8 +25,8 @@ set SCRIPT_HOME=%~dp0
 set TEST_HOME=%~1
 
 
-set EXAMPLES_VER=1.0.2-dev
-set BENCHMARK_VER=220dev-vs17
+set EXAMPLES_VER=1.0.2-dev.1
+set BENCHMARK_VER=220dev1
 
 
 set TESTFILES_URL=https://github.com/OpenWaterAnalytics/epanet-example-networks/archive/v%EXAMPLES_VER%.zip
diff --git a/tools/before-test.sh b/tools/before-test.sh
index 8cb902b..afd543a 100755
--- a/tools/before-test.sh
+++ b/tools/before-test.sh
@@ -22,8 +22,8 @@
 SCRIPT_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 TEST_HOME=$1
 
-EXAMPLES_VER="1.0.1"
-BENCHMARK_VER="2012vs10"
+EXAMPLES_VER="1.0.2-dev.1"
+BENCHMARK_VER="2020dev1"
 
 TEST_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/archive/v${EXAMPLES_VER}.tar.gz"
 BENCH_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/download/v${EXAMPLES_VER}/epanet-benchmark-${BENCHMARK_VER}.tar.gz"