diff --git a/unleash-server/lib/api.js b/unleash-server/lib/featureApi.js
similarity index 100%
rename from unleash-server/lib/api.js
rename to unleash-server/lib/featureApi.js
diff --git a/unleash-server/server.js b/unleash-server/server.js
index c4f76655a2..f92f173a28 100644
--- a/unleash-server/server.js
+++ b/unleash-server/server.js
@@ -3,7 +3,7 @@ var express     = require('express'),
     log4js      = require('log4js'),
     logger      = require('./lib/logger'),
     routes      = require('./lib/routes'),
-    api         = require('./lib/api'),
+    api         = require('./lib/featureApi'),
     validator   = require('express-validator'),
     app         = express(),
     router      = express.Router(),
diff --git a/unleash-server/test/eventStoreSpec.js b/unleash-server/test/eventStoreSpec.js
index 35172b6894..e5d84a0801 100644
--- a/unleash-server/test/eventStoreSpec.js
+++ b/unleash-server/test/eventStoreSpec.js
@@ -5,7 +5,7 @@ var eventStore = require('../lib/eventStore');
 describe('EventStore', function () {
     describe('#create()', function () {
         it('should emit event', function (done) {
-            eventStore.on(events.featureCreated, function (x) {
+            eventStore.once(events.featureCreated, function (x) {
                     assert(x);
                     done();
                 }
diff --git a/unleash-server/test/apiSpec.js b/unleash-server/test/featureApiSpec.js
similarity index 100%
rename from unleash-server/test/apiSpec.js
rename to unleash-server/test/featureApiSpec.js