diff --git a/.npmignore b/.npmignore
index 53c37a1..12d00f7 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1 +1,2 @@
-dist
\ No newline at end of file
+dist
+TODO.txt
\ No newline at end of file
diff --git a/package.json b/package.json
index d816d0b..45cf36b 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,13 @@
 {
   "name": "hipku",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Encode any IP address as a haiku",
   "main": "index.js",
+  "devDependencies": {
+    "jasmine-node": ">=1.14.5"
+  },
   "scripts": {
-    "test": "echo \"TODO: add tests\""
+    "test": "jasmine-node test/spec"
   },
   "repository": {
     "type": "git",
@@ -16,7 +19,9 @@
     "ipv6",
     "haiku"
   ],
-  "author": "Gabriel Martin",
+  "author": {
+    "name": "Gabriel Martin"
+  },
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/gabemart/hipku/issues"
diff --git a/test/spec/allVersions.spec.js b/test/spec/allVersions.spec.js
new file mode 100644
index 0000000..17c7e94
--- /dev/null
+++ b/test/spec/allVersions.spec.js
@@ -0,0 +1,66 @@
+/*
+** Test that a given input results in an output that can
+** be decoded to match the original input. Applicable to
+** all versions.
+*/
+
+var Hipku = require('../../index.js');
+
+describe("All versions of Hipku", function() {
+  
+  it("should symetrically encode and decode IPv4 addresses", function() {   
+    expect(
+      Hipku.decode(Hipku.encode('0.0.0.0'))
+    ).toBe('0.0.0.0');
+
+    expect(
+      Hipku.decode(Hipku.encode('127.0.0.1'))
+    ).toBe('127.0.0.1');
+    
+    expect(
+      Hipku.decode(Hipku.encode('82.158.98.2'))
+    ).toBe('82.158.98.2');    
+    
+    expect(
+      Hipku.decode(Hipku.encode('255.255.255.255'))
+    ).toBe('255.255.255.255');  
+  });
+  
+  it("should symetrically encode and decode IPv6 addresses", function() { 
+
+    expect(
+      Hipku.decode(Hipku.encode('0:0:0:0:0:0:0:0'))
+    ).toBe('0:0:0:0:0:0:0:0');
+
+    expect(
+      Hipku.decode(Hipku.encode('2c8f:27aa:61fd:56ec:7ebe:d03a:1f50:475f'))
+    ).toBe('2c8f:27aa:61fd:56ec:7ebe:d03a:1f50:475f');
+
+    expect(
+      Hipku.decode(Hipku.encode('ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff'))
+    ).toBe('ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff');       
+  });
+  
+  it("should correctly expand the abbreviated IPv6 format", function() {
+  
+    var fullAddress = '0:0:0:0:0:0:0:0';
+    
+    expect(
+      Hipku.decode(Hipku.encode('::0'))
+    ).toBe(fullAddress);
+    
+    expect(
+      Hipku.decode(Hipku.encode('0::'))
+    ).toBe(fullAddress);    
+
+    expect(
+      Hipku.decode(Hipku.encode('0::0'))
+    ).toBe(fullAddress);
+    
+    expect(
+      Hipku.decode(Hipku.encode('0:0::0:0'))
+    ).toBe(fullAddress);
+  
+  });
+  
+});
\ No newline at end of file
diff --git a/test/spec/currentVersion.spec.js b/test/spec/currentVersion.spec.js
new file mode 100644
index 0000000..cea21c1
--- /dev/null
+++ b/test/spec/currentVersion.spec.js
@@ -0,0 +1,69 @@
+/*
+** Test that a series of inputs match the outputs
+** specified by the current version's dictionaries
+** and schemas. Tests must be updated whenever changes
+** are made to any dicationary or schema.
+*/
+
+var Hipku = require('../../index.js');
+
+describe("The current version of Hipku", function() {
+
+  var Ipv4HipkuIpPairs, Ipv6HipkuIpPairs;
+
+  beforeEach(function() {
+    Ipv4HipkuIpPairs = [
+      ['0.0.0.0', 'The agile beige ape\naches in the ancient canyon.\nAutumn colors blow.\n'],
+      ['127.0.0.1', 'The hungry white ape\naches in the ancient canyon.\nAutumn colors crunch.\n'],
+      ['82.158.98.2', 'The fearful blue newt\nwakes in the foggy desert.\nAutumn colors dance.\n'],
+      ['255.255.255.255', 'The weary white wolf\nyawns in the wind-swept wetlands.\nYellowwood leaves twist.\n']
+    ];  
+    
+    Ipv6HipkuIpPairs = [
+      ['0:0:0:0:0:0:0:0',
+        'Ace ants and ace ants\naid ace ace ace ace ace ants.\nAce ants aid ace ants.\n'],
+      ['2c8f:27aa:61fd:56ec:7ebe:d03a:1f50:475f',
+        'Cursed mobs and crazed queens\nfeel wrong gruff tired moist slow sprats.\nFaint bulls dread fond fruits.\n'],
+      ['ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff',
+        'Young yaks and young yaks\ntend young young young young young yaks.\nYoung yaks tend young yaks.\n']
+    ];
+  });
+  
+  afterEach(function() {
+    Ipv4HipkuIpPairs = null;
+    Ipv6HipkuIpPairs = null;
+  });
+
+  it("should correctly encode a series of test IPv4 addresses", function() {
+    for (var i = 0; i < Ipv4HipkuIpPairs.length; i++) {
+      expect(
+        Hipku.encode(Ipv4HipkuIpPairs[i][0])
+      ).toBe(Ipv4HipkuIpPairs[i][1]); 
+    }             
+  });
+
+  it("should correctly decode a series of test IPv4 hipku", function() {
+    for (var i = 0; i < Ipv4HipkuIpPairs.length; i++) {
+      expect(
+        Hipku.decode(Ipv4HipkuIpPairs[i][1])
+      ).toBe(Ipv4HipkuIpPairs[i][0]); 
+    }    
+  });
+
+  it("should correctly encode a series of test IPv6 addresses", function() {
+    for (var i = 0; i < Ipv6HipkuIpPairs.length; i++) {
+      expect(
+        Hipku.encode(Ipv6HipkuIpPairs[i][0])
+      ).toBe(Ipv6HipkuIpPairs[i][1]); 
+    }            
+  });
+
+  it("should correctly decode a series of test IPv6 hipku", function() {
+    for (var i = 0; i < Ipv6HipkuIpPairs.length; i++) {
+      expect(
+        Hipku.decode(Ipv6HipkuIpPairs[i][1])
+      ).toBe(Ipv6HipkuIpPairs[i][0]); 
+    }   
+  });    
+
+});
\ No newline at end of file