diff --git a/example/benchmark.dart b/example/benchmark.dart
index 8859fb2..c9a9102 100644
--- a/example/benchmark.dart
+++ b/example/benchmark.dart
@@ -34,12 +34,12 @@ main(List<String> args) async {
       "hello": "world"
     });
 
-    var json = JSON.encode({
+    var jsonStr = json.encode({
       "hello": "world"
     });
 
     unpack(packed);
-    JSON.decode(json);
+    json.decode(jsonStr);
   }
 
   if (args.contains("--savings")) {
@@ -48,7 +48,7 @@ main(List<String> args) async {
       numbers.add(i);
     }
 
-    var jsonBytes = UTF8.encode(JSON.encode(numbers)).length;
+    var jsonBytes = utf8.encode(json.encode(numbers)).length;
     var msgpackBytes = pack(numbers).length;
     var fract = new Fraction(jsonBytes, msgpackBytes);
     fract = fract.reduce();
@@ -249,7 +249,7 @@ main(List<String> args) async {
 
 testObjectDecode(String desc, input) {
   print("${desc}:");
-  var packedJson = JSON.encode(input);
+  var packedJson = json.encode(input);
   var packed = pack(input);
   var watch = new Stopwatch();
   var times = [];
@@ -274,7 +274,7 @@ testObjectDecode(String desc, input) {
   for (var i = 1; i <= TIMES; i++) {
     watch.reset();
     watch.start();
-    JSON.decode(packedJson);
+    json.decode(packedJson);
     watch.stop();
     times.add(watch.elapsedMicroseconds);
   }
@@ -320,12 +320,12 @@ testObjectEncode(String desc, input) {
   print("    Shortest Time: ${times.first} microseconds (${times.first / 1000}ms)");
   print("    Size: ${size} bytes");
   watch.reset();
-  size = UTF8.encode(JSON.encode(input)).length;
+  size = utf8.encode(json.encode(input)).length;
   times.clear();
   for (var i = 1; i <= TIMES; i++) {
     watch.reset();
     watch.start();
-    JSON.encode(input);
+    json.encode(input);
     watch.stop();
     times.add(watch.elapsedMicroseconds);
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 16897b9..321ea63 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,9 +1,12 @@
 name: msgpack
 description: MsgPack for Dart
-version: 0.9.0
+version: 0.10.0
 authors:
 - Kenneth Endfinger <kaendfinger@gmail.com>
 - Dan Ellis <dan@danellis.me>
+- Matthew Butler <butler.matthew@gmail.com>
 homepage: https://github.com/DirectMyFile/msgpack.dart
+environment:
+  sdk: ">=2.0.0 <3.0.0"
 dev_dependencies:
-  test: "^0.12.0"
+  test: ^1.3.0
diff --git a/test/msgpack_test.dart b/test/msgpack_test.dart
index af65bc4..ac95569 100644
--- a/test/msgpack_test.dart
+++ b/test/msgpack_test.dart
@@ -10,7 +10,7 @@ var isList = predicate((e) => e is List, 'is a List');
 class TestMessage extends Message {
   int a;
   String b;
-  Map<int, String> c;
+  Map c;
 
   TestMessage(this.a, this.b, this.c);
 
@@ -22,7 +22,7 @@ class TestMessage extends Message {
 class OuterMessage extends Message {
   String a;
   bool b;
-  List<int> list;
+  List list;
   TestMessage inner;
 
   OuterMessage(this.a, this.b, this.list, this.inner);