var vows = require('vows'),
    assert = require('assert');

var server = require('../../servers/websocket-broker');

// Environment
process.env['PORT'] = 9000;

var onstart = function(payload) {
    server.shutdown(function() {
    });    
}

vows.describe('WoT.City Framework Tests').addBatch({
    'Testing WebSocket Broker Application Server': {
        'is server started': function () {
            server.start({
                onstart: onstart
            });
        }
    }
}).export(module);;

@@ -54,16 +54,221 @@
 ert');%0A%0A
+// Environment%0Aprocess.env%5B'PORT'%5D = 9000;%0A%0Avows.describe('WoT.City Framework Tests').addBatch(%7B%0A    'Testing WebSocket Broker Application Server': %7B%0A        'is server started': function () %7B%0A            
 var serv
@@ -320,52 +320,20 @@
 );%0A%0A
-// Environment%0Aprocess.env%5B'PORT'%5D = 9000;%0A%0A
+            
 var 
@@ -358,24 +358,36 @@
 (payload) %7B%0A
+            
     server.s
@@ -415,71 +415,166 @@
     
-%7D);    %0A%7D%0A%0Avows.describe('WoT.City Framework Tests').addBatch(%7B
+                return 0;%0A                %7D);    %0A            %7D;%0A%0A            server.start(%7B%0A                onstart: onstart%0A            %7D);%0A        %7D%0A    %7D,
 %0A   
@@ -579,33 +579,28 @@
    'Testing 
-WebSocket
+CoAP
  Broker Appl
@@ -653,32 +653,258 @@
 : function () %7B%0A
+            var server = require('../../servers/coap-broker'); %0A%0A            var onstart = function(payload) %7B%0A                server.shutdown(function() %7B%0A                    return 0;%0A                %7D);    %0A            %7D;%0A%0A
             serv
@@ -978,16 +978,20 @@
  %7D%0A    %7D
+    
 %0A%7D).expo

update test suite, #29