diff --git a/.gitignore b/.gitignore
index 2ceb8ee..5f6cfb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,9 @@
 build/
 packages/
 .buildlog
+.idea/
+.dart_tool/
+.packages
 
 # Or the files created by dart2js.
 *.dart.js
diff --git a/lib/src/sanitizer.dart b/lib/src/sanitizer.dart
index 5494a74..60ee900 100644
--- a/lib/src/sanitizer.dart
+++ b/lib/src/sanitizer.dart
@@ -27,7 +27,7 @@ double toFloat(String str) {
   try{
     return double.parse(str);
   } catch (e) {
-    return double.NAN;
+    return double.nan;
   }
 }
 
@@ -45,7 +45,7 @@ num toInt(String str, {int radix:10}) {
     try {
       return double.parse(str).toInt();
     } catch (e) {
-      return double.NAN;
+      return double.nan;
     }
   }
 }
diff --git a/lib/src/validator.dart b/lib/src/validator.dart
index 20215b4..ba27473 100644
--- a/lib/src/validator.dart
+++ b/lib/src/validator.dart
@@ -481,7 +481,7 @@ bool isISBN(String str, [version]) {
 /// check if the string is valid JSON
 bool isJSON(str) {
   try {
-    JSON.decode(str);
+    json.decode(str);
   } catch (e) {
     return false;
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 38354cd..44f1aa8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,8 +1,12 @@
 name: validator
-version: 0.0.7
+version: 0.0.8
 author: Karan Goel <karan@goel.io>
 description: String validation and sanitization for Dart.
 homepage: https://github.com/karan/validator.dart
 documentation: https://github.com/karan/validator.dart
+
+environment:
+  sdk: '>= 1.1.0 < 3.0.0'
+
 dependencies:
-  unittest: any
+  test: any
diff --git a/test/packages b/test/packages
deleted file mode 120000
index a16c405..0000000
--- a/test/packages
+++ /dev/null
@@ -1 +0,0 @@
-../packages
\ No newline at end of file
diff --git a/test/sanitizer_test.dart b/test/sanitizer_test.dart
index 51da51c..1b13094 100644
--- a/test/sanitizer_test.dart
+++ b/test/sanitizer_test.dart
@@ -59,7 +59,7 @@ void testToFloat() {
       '1': 1.0,
       '2.': 2.0,
       '-1.4': -1.4,
-      'foo': double.NAN
+      'foo': double.nan
     }
   });
 }
@@ -72,7 +72,7 @@ void testToInt() {
     'expect': {
       '1.4': 1,
       '2.': 2,
-      'foo': double.NAN
+      'foo': double.nan
     }
   });
 }
diff --git a/tool/packages b/tool/packages
deleted file mode 120000
index a16c405..0000000
--- a/tool/packages
+++ /dev/null
@@ -1 +0,0 @@
-../packages
\ No newline at end of file