diff --git a/app.js b/app.js
index 5c85d79..195a10f 100644
--- a/app.js
+++ b/app.js
@@ -24,6 +24,6 @@ var options = {
   regionFolder: settings.regionFolder
 };
 
-mcServer.createMCServer(options);
+module.exports=mcServer.createMCServer(options);
 
 
diff --git a/test/index.js b/test/index.js
index 615a105..a6b36d6 100644
--- a/test/index.js
+++ b/test/index.js
@@ -1,19 +1,14 @@
-var boot = require('../app').boot,
-    shutdown = require('../app').shutdown,
-    port = require('../app').port;
-   
-    it('passes', function() {
-      return true;
-    });
-    describe("Server", function() {
-      it("Is running", function(done) {
-        var client = net.Socket();
-        client.connect(25565, '127.0.0.1', function() {
-          client.close(); // or whatever the method to close the socket;
-          done();
-        });
-        client.on('error', function(err) {
-          done();
-        });
-    });
+var net = require('net');
+describe("Server", function() {
+  before(function(done){
+    var serv=require("../app");
+    serv.on("listening",function(){
+      done(null);
+    })
+  });
+  it("Is running", function(done) {
+    var client = net.Socket();
+    client.connect(25565, '127.0.0.1', done);
+    client.on('error', done);
+  });
 });