diff --git a/default.nix b/default.nix
index 3c381abd7f3..d4c0723a70c 100644
--- a/default.nix
+++ b/default.nix
@@ -32,8 +32,8 @@ let real-dvm =
     then
       let dev = builtins.fetchGit {
         url = "ssh://git@github.com/dfinity-lab/dev";
-        rev = "0ce1f507cb3bb4fa8bba9223082a382fc9191f67";
-        ref = "master";
+        ref = "joachim/more-logging";
+        rev = "70d3b158611c96fe5e82b66d4a62c9d02bcd5345";
       }; in
       # Pass devel = true until the dev test suite runs on MacOS again
       (import dev { devel = true; }).dvm
@@ -121,11 +121,13 @@ rec {
       asc --version
       make -C stdlib ASC=asc all
       make -C samples ASC=asc all
-      make -C test VERBOSE=1 ASC=asc quick
     '' +
-      (if test-dvm then ''
-      make --load-average -j8 -C test/run-dfinity VERBOSE=1 ASC=asc quick
-      '' else "");
+      (if test-dvm
+      then ''
+      make -C test ASC=asc parallel
+      '' else ''
+      make -C test ASC=asc quick
+      '');
 
     installPhase = ''
       mkdir -p $out
diff --git a/test/Makefile b/test/Makefile
index 693499a6eba..e8763d23934 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,7 +3,7 @@ all:
 	$(MAKE) -C run
 	$(MAKE) -C run-dfinity
 
-MAKE_PAR := $(MAKE) --no-print-directory --load-average -j $(shell getconf _NPROCESSORS_ONLN)
+MAKE_PAR := $(MAKE) --no-print-directory --load-average -j $(shell getconf _NPROCESSORS_ONLN) --keep-going
 
 quick:
 	$(MAKE_PAR) -C fail quick
diff --git a/test/dvm.sh b/test/dvm.sh
index 16037510060..7a1c8f6d372 100755
--- a/test/dvm.sh
+++ b/test/dvm.sh
@@ -7,7 +7,7 @@ then
 fi
 
 name="$(basename $1 .wasm)_0"
-DVM_TMP=$(mktemp -d)
+DVM_TMP=$(mktemp --directory --tmpdir dvm-XXXXXX)
 trap 'rm -rf $DVM_TMP' EXIT
 
 export LANG=C
diff --git a/test/run-dfinity/ok/actor-reexport.dvm-run.ok b/test/run-dfinity/ok/actor-reexport.dvm-run.ok
index 3292a97eddf..86607643126 100644
--- a/test/run-dfinity/ok/actor-reexport.dvm-run.ok
+++ b/test/run-dfinity/ok/actor-reexport.dvm-run.ok
@@ -1 +1 @@
-W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling start failed with trap message: Uncaught RuntimeError: unreachable
diff --git a/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok b/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
index 3292a97eddf..bc31b890000 100644
--- a/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
+++ b/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
@@ -1 +1,2 @@
-W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling func$92 failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling func$98 failed with trap message: Uncaught RuntimeError: unreachable
diff --git a/test/run-dfinity/ok/counter-class.dvm-run.ok b/test/run-dfinity/ok/counter-class.dvm-run.ok
new file mode 100644
index 00000000000..86607643126
--- /dev/null
+++ b/test/run-dfinity/ok/counter-class.dvm-run.ok
@@ -0,0 +1 @@
+W, hypervisor: calling start failed with trap message: Uncaught RuntimeError: unreachable
diff --git a/test/run-dfinity/ok/overflow.dvm-run.ok b/test/run-dfinity/ok/overflow.dvm-run.ok
index 8ca337c71a9..95eb31c1554 100644
--- a/test/run-dfinity/ok/overflow.dvm-run.ok
+++ b/test/run-dfinity/ok/overflow.dvm-run.ok
@@ -1,5 +1,5 @@
-W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
-W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling func$104 failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling func$110 failed with trap message: Uncaught RuntimeError: unreachable
 This is reachable.
 This is reachable.
 This is reachable.