diff --git a/hash.go b/hash.go
index 03c6350..f2b3499 100644
--- a/hash.go
+++ b/hash.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-  "math/rand"
   "crypto/md5"
   "fmt"
   "hash/adler32"
   "io"
+  "math/rand"
   "time"
 )
 
diff --git a/hash_test.go b/hash_test.go
new file mode 100644
index 0000000..a4d4849
--- /dev/null
+++ b/hash_test.go
@@ -0,0 +1,40 @@
+package main
+
+import (
+  "fmt"
+  "testing"
+)
+
+func TestRand64(t *testing.T) {
+  var i interface{}
+  i = Rand64()
+  v, ok := i.(int64)
+  if (!ok) {
+    t.Errorf("Rand64 returned wrong type")
+  }
+  if (v < 0) {
+    t.Errorf("Rand64 returned a too small number [%d]", v)
+  }
+}
+
+func TestMd5Bytes(t *testing.T) {
+  var blob = []byte("Hurp til you Derp")
+  var expected = "3ef08fa896a154eee3c97f037c9d6dfc"
+  var actual = fmt.Sprintf("%x", GetMd5FromBytes(blob))
+  if (actual != expected) {
+    t.Errorf("Md5FromBytes sum did not match! %s != %s",actual,expected)
+  }
+}
+
+func TestMd5String(t *testing.T) {
+  var blob = "Hurp til you Derp"
+  var expected = "3ef08fa896a154eee3c97f037c9d6dfc"
+  var actual = fmt.Sprintf("%x", GetMd5FromString(blob))
+  if (actual != expected) {
+    t.Errorf("Md5FromString sum did not match! %s != %s",actual,expected)
+  }
+}
+
+func TestHash(t *testing.T) {
+}
+