diff --git a/package.json b/package.json
index c03a5ae..ca60c04 100644
--- a/package.json
+++ b/package.json
@@ -32,8 +32,8 @@
     "minimist": "^1.2.0",
     "node-uuid": "^1.4.7",
     "superagent": "^2.0.0",
-    "yang-express": "^0.2.3",
-    "yang-js": "^0.14.22"
+    "yang-express": "^0.2.5",
+    "yang-js": "^0.15.0"
   },
   "optionalDependencies": {
     "corenova": "^1.0.0"
diff --git a/schema/cord-core.yang b/schema/cord-core.yang
index b399362..584cf28 100644
--- a/schema/cord-core.yang
+++ b/schema/cord-core.yang
@@ -34,7 +34,7 @@
   /*** primary configuration tree for this module ***/
   
   list subscriber {
-    uses csub:subscriber-controller;
+    uses csub:subscriber;
     key "id";
 
     description
diff --git a/src/api/server.coffee b/src/api/server.coffee
index ae2ada4..c315445 100644
--- a/src/api/server.coffee
+++ b/src/api/server.coffee
@@ -7,8 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 
-require('events').EventEmitter.defaultMaxListeners = 100
-
 yang = require('yang-js')
 argv = require('minimist')(process.argv.slice(2))
 
diff --git a/test/mocha.opts b/test/mocha.opts
new file mode 100644
index 0000000..38f602d
--- /dev/null
+++ b/test/mocha.opts
@@ -0,0 +1,3 @@
+--require should
+--compilers coffee:coffee-script/register
+--sort