diff --git a/Makefile b/Makefile
index d62cdf5..b1a94d1 100644
--- a/Makefile
+++ b/Makefile
@@ -203,10 +203,13 @@
 	$(error JIRI_ROOT is not set)
 endif
 
+.PHONY: test
+test: test-unit
+
 # TODO(alexfandrianto): I split off the syncbase logic from game.dart because it
 # would not run in a stand-alone VM. We will need to add mojo_test eventually.
-.PHONY: test
-test: packages
+.PHONY: test-unit
+test-unit: packages
 	# Mock the syncbase implementations and unmock regardless of the test outcome.
 	$(MAKE) mock
 	pub run test -r expanded $(DART_TEST_FILES) || ($(MAKE) unmock && exit 1)
diff --git a/pubspec.lock b/pubspec.lock
index a69db82..e69ab51 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -4,7 +4,7 @@
   analyzer:
     description: analyzer
     source: hosted
-    version: "0.26.4"
+    version: "0.27.0"
   archive:
     description: archive
     source: hosted
@@ -31,7 +31,7 @@
     version: "0.0.7"
   cassowary:
     description:
-      path: "../../../../../flutter/packages/cassowary"
+      path: "../../../flutter/packages/cassowary"
       relative: true
     source: path
     version: "0.1.7"
@@ -65,19 +65,19 @@
     version: "0.9.1+2"
   flutter:
     description:
-      path: "../../../../../flutter/packages/flutter"
+      path: "../../../flutter/packages/flutter"
       relative: true
     source: path
     version: "0.0.21"
   flutter_tools:
     description:
-      path: "../../../../../flutter/packages/flutter_tools"
+      path: "../../../flutter/packages/flutter_tools"
       relative: true
     source: path
     version: "0.0.38"
   flx:
     description:
-      path: "../../../../../flutter/packages/flx"
+      path: "../../../flutter/packages/flx"
       relative: true
     source: path
     version: "0.0.10"
@@ -120,30 +120,30 @@
   mojo:
     description: mojo
     source: hosted
-    version: "0.4.6"
+    version: "0.4.8"
   mojo_apptest:
     description: mojo_apptest
     source: hosted
-    version: "0.2.9"
+    version: "0.2.12"
   mojo_sdk:
     description: mojo_sdk
     source: hosted
-    version: "0.2.5"
+    version: "0.2.7"
   mojo_services:
     description: mojo_services
     source: hosted
-    version: "0.4.8"
+    version: "0.4.10"
   mojom:
     description: mojom
     source: hosted
-    version: "0.2.10"
+    version: "0.2.12"
   mustache4dart:
     description: mustache4dart
     source: hosted
     version: "1.0.10"
   newton:
     description:
-      path: "../../../../../flutter/packages/newton"
+      path: "../../../flutter/packages/newton"
       relative: true
     source: path
     version: "0.1.5"
@@ -186,11 +186,11 @@
   sky_engine:
     description: sky_engine
     source: hosted
-    version: "0.0.69"
+    version: "0.0.71"
   sky_services:
     description: sky_services
     source: hosted
-    version: "0.0.69"
+    version: "0.0.71"
   source_map_stack_trace:
     description: source_map_stack_trace
     source: hosted
@@ -218,7 +218,7 @@
   test:
     description: test
     source: hosted
-    version: "0.12.6"
+    version: "0.12.6+1"
   typed_data:
     description: typed_data
     source: hosted
@@ -230,7 +230,7 @@
   v23discovery:
     description: v23discovery
     source: hosted
-    version: "0.0.6"
+    version: "0.0.7"
   vector_math:
     description: vector_math
     source: hosted
diff --git a/pubspec.yaml b/pubspec.yaml
index 68105d4..57b6e04 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@
   v23discovery: ">=0.0.0 <0.1.0"
   syncbase: ">=0.0.0 <0.1.0"
   flutter:
-    path: ../../../../../flutter/packages/flutter
+    path: ../../../flutter/packages/flutter
   flutter_tools:
-    path: ../../../../../flutter/packages/flutter_tools
+    path: ../../../flutter/packages/flutter_tools
   test: any