diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 00000000..ab1cfb4e
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+test/*
diff --git a/Gulpfile.js b/Gulpfile.js
index ddccbcb0..7b1f80e4 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -1,13 +1,20 @@
 
 const babel = require('rollup-plugin-babel');
+const connect = require('connect');
 const eslint = require('gulp-eslint');
 const gulp = require('gulp');
 const header = require('gulp-header');
+const http = require('http');
 const minify = require('uglify-js').minify;
+const mochaPhantomJS = require('gulp-mocha-phantomjs');
 const rollup = require('rollup-stream');
+const serveStatic = require('serve-static');
 const source = require('vinyl-source-stream');
 const uglify = require('rollup-plugin-uglify');
 
+var parentServer
+var childServer;
+
 const pkg = require('./package.json');
 const banner = ['/**',
   ' * <%= pkg.name %> - <%= pkg.description %>',
@@ -41,5 +48,29 @@ gulp.task('lint', () =>
     .pipe(eslint.failAfterError())
 );
 
+gulp.task('parent-test-server', done => {
+  parentServer = http.createServer(
+      connect()
+        .use(serveStatic('.'))
+        .use(serveStatic('test/fixtures'))
+    )
+    .listen(9000, done);
+});
+gulp.task('child-test-server', done => {
+  childServer = http.createServer(
+      connect()
+        .use(serveStatic('.'))
+        .use(serveStatic('test/fixtures'))
+    )
+    .listen(9001, done);
+});
+
+gulp.task('test', ['parent-test-server', 'child-test-server'], () => {
+  const stream = mochaPhantomJS();
+  stream.write({ path: 'http://localhost:9001/test/runner.html' });
+  stream.end();
+  return stream;
+});
+
 gulp.task('watch', () => gulp.watch('./lib/postmate.js', ['build']));
 gulp.task('build-watch', ['build', 'watch']);
diff --git a/README.md b/README.md
index 5cc84571..c4044ee5 100644
--- a/README.md
+++ b/README.md
@@ -90,9 +90,9 @@ new Postmate.Handshake({
 
 #### Properties
 
-Name | Type | Description
+Name | Type | Description | Default
 :--- | :--- | :---
-**`container`** | `DOM Node Element` | _An element to append the iFrame to_
+**`container`** (optional) | `DOM Node Element` | _An element to append the iFrame to_ | `document.body`
 **`url`** | `String` | _A URL to load in the iFrame. The origin of this URL will also be used for securing message transport_
 
 ***
diff --git a/build/postmate.min.js b/build/postmate.min.js
index 0cdbaad2..3397eab1 100644
--- a/build/postmate.min.js
+++ b/build/postmate.min.js
@@ -4,4 +4,4 @@
  * @link https://github.com/dollarshaveclub/postmate
  * @license MIT
  */
-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):e.Postmate=n()}(this,function(){"use strict";function e(){var e;(e=console).log.apply(e,arguments)}function n(e){var n=document.createElement("a");return n.href=e,n.origin}function t(e,n){return e.origin===n&&("object"===r(e.data)&&("postmate"in e.data&&e.data.type===d))}function a(e,n,t){var a="function"==typeof e[n]?e[n](t):e[n];return Promise.resolve(a)}function i(n){var i=n.id,r=n.context,o=n.parent,s=n.parentOrigin,u=n.frame,c=n.child,h=n.childOrigin;return e('Registering consumer: "'+i+'"'),"parent"===i?(e("Parent awaiting messages..."),{frame:u,get:function(e,n){return new Promise(function(t){var a=(new Date).getTime(),i=function e(n){n.data.uid===a&&(o.removeEventListener("message",e,!1),t(n.data.value))};o.addEventListener("message",i,!1),c.postMessage({data:n,postmate:"request",type:d,key:e,uid:a},h)})}}):void("child"===i&&(e("Child awaiting messages..."),c.addEventListener("message",function(n){if(t(n,s)){e("Child received message",n.data);var i=n.data,o=i.data,u=i.key,c=i.uid;a(r,u,o).then(function(e){return n.source.postMessage({key:u,postmate:"reply",type:d,uid:c,value:e},n.origin)})}})))}var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e},o=function(e,n){if(!(e instanceof n))throw new TypeError("Cannot call a class as a function")},s=function(){function e(e,n){for(var t=0;t<n.length;t++){var a=n[t];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}}return function(n,t,a){return t&&e(n.prototype,t),a&&e(n,a),n}}(),d="application/x-postmate-v1+json",u=function(){function n(e){return o(this,n),this.id="child",this.child=window,this.context=e,this.parent=this.child.parent,this.sendHandshakeReply()}return s(n,[{key:"sendHandshakeReply",value:function(){var n=this;return new Promise(function(t,a){var r=function r(o){return"handshake"===o.data.postmate?(e("Child: Received handshake from Parent"),n.child.removeEventListener("message",r,!1),e("Child: Sending handshake reply to Parent"),o.source.postMessage({postmate:"handshake-reply",type:d},o.origin),n.parentOrigin=o.origin,e("Child: Saving Parent origin",n.parentOrigin),t(new i(n))):a("Handshake Reply Failed")};n.child.addEventListener("message",r,!1)})}}]),n}();return u.Handshake=function(){function a(e){o(this,a);var n=e.container,t=e.url;return this.id="parent",this.parent=window,this.frame=document.createElement("iframe"),n.appendChild(this.frame),this.child=this.frame.contentWindow,this.sendHandshake(t)}return s(a,[{key:"sendHandshake",value:function(a){var r=this,o=n(a);return new Promise(function(n,s){var u=function a(d){return!!t(d,o)&&("handshake-reply"===d.data.postmate?(e("Parent: Received handshake reply from Child"),r.parent.removeEventListener("message",a,!1),r.childOrigin=d.origin,e("Parent: Saving Child origin",r.childOrigin),n(new i(r))):(e("Parent: Invalid handshake reply"),s("Failed handshake")))};r.parent.addEventListener("message",u,!1),r.frame.onload=function(){e("Parent: Sending handshake"),r.child.postMessage({postmate:"handshake",type:d},o)},e("Parent: Loading frame"),r.frame.src=a})}}]),a}(),u});
\ No newline at end of file
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):e.Postmate=n()}(this,function(){"use strict";function e(){var e;(e=console).log.apply(e,arguments)}function n(e){var n=document.createElement("a");return n.href=e,n.origin}function t(e,n){return e.origin===n&&("object"===r(e.data)&&("postmate"in e.data&&e.data.type===d))}function a(e,n,t){var a="function"==typeof e[n]?e[n](t):e[n];return Promise.resolve(a)}function i(n){var i=n.id,r=n.context,o=n.parent,s=n.parentOrigin,u=n.frame,c=n.child,h=n.childOrigin;return e('Registering consumer: "'+i+'"'),"parent"===i?(e("Parent awaiting messages..."),{frame:u,get:function(e,n){return new Promise(function(t){var a=(new Date).getTime(),i=function e(n){n.data.uid===a&&(o.removeEventListener("message",e,!1),t(n.data.value))};o.addEventListener("message",i,!1),c.postMessage({data:n,postmate:"request",type:d,key:e,uid:a},h)})}}):void("child"===i&&(e("Child awaiting messages..."),c.addEventListener("message",function(n){if(t(n,s)){e("Child received message",n.data);var i=n.data,o=i.data,u=i.key,c=i.uid;a(r,u,o).then(function(e){return n.source.postMessage({key:u,postmate:"reply",type:d,uid:c,value:e},n.origin)})}})))}var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e},o=function(e,n){if(!(e instanceof n))throw new TypeError("Cannot call a class as a function")},s=function(){function e(e,n){for(var t=0;t<n.length;t++){var a=n[t];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}}return function(n,t,a){return t&&e(n.prototype,t),a&&e(n,a),n}}(),d="application/x-postmate-v1+json",u=function(){function n(e){return o(this,n),this.id="child",this.child=window,this.context=e,this.parent=this.child.parent,this.sendHandshakeReply()}return s(n,[{key:"sendHandshakeReply",value:function(){var n=this;return new Promise(function(t,a){var r=function r(o){return"handshake"===o.data.postmate?(e("Child: Received handshake from Parent"),n.child.removeEventListener("message",r,!1),e("Child: Sending handshake reply to Parent"),o.source.postMessage({postmate:"handshake-reply",type:d},o.origin),n.parentOrigin=o.origin,e("Child: Saving Parent origin",n.parentOrigin),t(new i(n))):a("Handshake Reply Failed")};n.child.addEventListener("message",r,!1)})}}]),n}();return u.Handshake=function(){function a(e){o(this,a);var n=e.container,t=e.url;return this.id="parent",this.parent=window,this.frame=document.createElement("iframe"),(n||document.body).appendChild(this.frame),this.child=this.frame.contentWindow,this.sendHandshake(t)}return s(a,[{key:"sendHandshake",value:function(a){var r=this,o=n(a);return new Promise(function(n,s){var u=function a(d){return!!t(d,o)&&("handshake-reply"===d.data.postmate?(e("Parent: Received handshake reply from Child"),r.parent.removeEventListener("message",a,!1),r.childOrigin=d.origin,e("Parent: Saving Child origin",r.childOrigin),n(new i(r))):(e("Parent: Invalid handshake reply"),s("Failed handshake")))};r.parent.addEventListener("message",u,!1),r.frame.onload=function(){e("Parent: Sending handshake"),r.child.postMessage({postmate:"handshake",type:d},o)},e("Parent: Loading frame"),r.frame.src=a})}}]),a}(),u});
\ No newline at end of file
diff --git a/lib/postmate.js b/lib/postmate.js
index 0de18038..c5455ce7 100644
--- a/lib/postmate.js
+++ b/lib/postmate.js
@@ -169,7 +169,7 @@ Postmate.Handshake = class Handshake {
     this.id = 'parent';
     this.parent = window;
     this.frame = document.createElement('iframe');
-    container.appendChild(this.frame);
+    (container || document.body).appendChild(this.frame);
     this.child = this.frame.contentWindow;
 
     return this.sendHandshake(url);
diff --git a/package.json b/package.json
index 36f89875..d16372bd 100644
--- a/package.json
+++ b/package.json
@@ -5,28 +5,32 @@
   "main": "lib/postmate.js",
   "devDependencies": {
     "babel-preset-es2015-rollup": "^1.1.1",
+    "chai": "^3.5.0",
+    "connect": "^3.4.1",
     "eslint-config-airbnb": "^9.0.1",
     "eslint-plugin-import": "^1.12.0",
-    "express": "^4.14.0",
     "gulp": "^3.9.1",
     "gulp-eslint": "^3.0.1",
     "gulp-header": "^1.8.7",
+    "gulp-mocha-phantomjs": "^0.11.0",
+    "mocha": "^3.0.2",
+    "mocha-phantomjs": "^4.1.0",
     "rollup-plugin-babel": "^2.6.1",
     "rollup-plugin-uglify": "^1.0.1",
     "rollup-stream": "^1.11.0",
+    "rsvp": "^3.2.1",
+    "serve-static": "^1.11.1",
     "uglify-js": "^2.7.0",
     "vinyl-source-stream": "^1.1.0"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "gulp test",
     "serve-parent": "PORT=4000 node sandbox.js",
     "serve-child": "PORT=4001 node sandbox.js",
     "build": "gulp build",
     "build-watch": "gulp build-watch",
     "lint": "gulp lint",
-    "postpublish": "PACKAGE_VERSION=$(cat package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]') && git tag $PACKAGE_VERSION && git push origin --tags",
-    "ssl-gen-cert": "openssl req -x509 -newkey rsa:2048 -keyout ./ssl/key.pem -out ./ssl/cert.pem -days 365",
-    "ssl-move-pass": "openssl rsa -in ./ssl/key.pem -out ./ssl/new-key.pem && mv ./ssl/new-key.pem ./ssl/key.pem"
+    "postpublish": "PACKAGE_VERSION=$(cat package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]') && git tag $PACKAGE_VERSION && git push origin --tags"
   },
   "repository": {
     "type": "git",
diff --git a/sandbox.js b/sandbox.js
deleted file mode 100644
index c9ec62dd..00000000
--- a/sandbox.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const path = require('path');
-const fs = require('fs');
-const https = require('https');
-const express = require('express');
-
-// Options
-const app = express();
-const port = process.env.PORT || 4000;
-const useSSL = fs.existsSync(path.join(__dirname, 'ssl', 'cert.pem'));
-const staticPath = (folder) => express.static(path.join(__dirname, folder));
-
-// Routes
-app.use('/sandbox', staticPath('sandbox'));
-app.use('/build', staticPath('build'));
-
-// http://blog.mgechev.com/2014/02/19/create-https-tls-ssl-application-with-express-nodejs/
-if (useSSL) {
-  https.createServer({
-    key: fs.readFileSync(path.join(__dirname, 'ssl', 'key.pem')),
-    cert: fs.readFileSync(path.join(__dirname, 'ssl', 'cert.pem')),
-  }, app).listen(port, () => console.log(`Sandbox served at https://localhost:${port}`));
-} else {
-  app.listen(port, () => console.log(`Sandbox served at http://localhost:${port}`));
-}
diff --git a/sandbox/parent.html b/sandbox/parent.html
deleted file mode 100644
index 5550e09d..00000000
--- a/sandbox/parent.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <style>
-      iframe {
-        border: 0;
-        outline: 1px solid #ccc;
-      }
-    </style>
-  </head>
-  <body>
-
-    <div id="target"></div>
-
-    <script type="text/javascript" src="../build/postmate.min.js"></script>
-    <script type="text/javascript">
-      var container = document.getElementById('target');
-      var url = 'http://localhost:4001/sandbox/child.html';
-
-      new Postmate.Handshake({
-        container,
-        url
-      })
-        .then(child => {
-          console.log("Parent Page Ready");
-          child.get('height', {foo:'bar'})
-            .then(height => child.frame.style.height = `${height}px`);
-        });
-    </script>
-  </body>
-</html>
diff --git a/sandbox/child.html b/test/fixtures/child.html
similarity index 78%
rename from sandbox/child.html
rename to test/fixtures/child.html
index bc531862..e893ad82 100644
--- a/sandbox/child.html
+++ b/test/fixtures/child.html
@@ -3,7 +3,7 @@
   <head>
     <style>
       body {
-        height: 1000px;
+        height: 1234px;
         padding: 0;
         margin: 0;
       }
@@ -13,7 +13,7 @@
     <script type="text/javascript" src="../build/postmate.min.js"></script>
     <script type="text/javascript">
       let height = function () { return document.height || document.body.offsetHeight; };
-      new Postmate({ height }).then(() => console.log('Child Page Ready'));
+      new Postmate({ height });
     </script>
   </body>
 </html>
diff --git a/test/runner.html b/test/runner.html
new file mode 100644
index 00000000..c663f514
--- /dev/null
+++ b/test/runner.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Mocha Tests</title>
+        <link rel="stylesheet" href="../node_modules/mocha/mocha.css">
+        <meta charset="utf-8">
+    </head>
+    <body>
+        <div id="mocha"></div>
+        <script src="../node_modules/mocha/mocha.js"></script>
+        <script src="../node_modules/chai/chai.js"></script>
+        <script src="../node_modules/rsvp/dist/rsvp.min.js"></script>
+        <script>window.Promise = RSVP.Promise;</script>
+        <script>mocha.setup('bdd')</script>
+        <script src="../build/postmate.min.js"></script>
+        <script src="./test.js"></script>
+        <div id="frame"></div>
+        <script>
+          if (window.mochaPhantomJS) { mochaPhantomJS.run(); }
+          else { mocha.run(); }
+        </script>
+    </body>
+</html>
diff --git a/test/test.js b/test/test.js
new file mode 100644
index 00000000..0ac03976
--- /dev/null
+++ b/test/test.js
@@ -0,0 +1,21 @@
+var expect = chai.expect;
+
+describe('postmate', function() {
+
+  it('should pass', function() {
+    expect(1).to.equal(1);
+  });
+
+  it('should fetch the childs height', function (done) {
+    new Postmate.Handshake({
+      container: document.getElementById('frame'),
+      url: 'http://localhost:9000/child.html'
+    }).then(function (child) {
+      child.get('height').then(function (height) {
+        expect(height).to.equal(1234);
+        done();
+      })
+      .catch(err => done(err));
+    });
+  });
+});