diff --git a/.travis.yml b/.travis.yml
index f6d2209..a6930cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,11 @@ script:
   - cd MQTTSNGateway
   - make CXX="g++-4.8" SENSORNET="xbee"
   - make CXX="g++-4.8" SENSORNET="udp"
+  - make test
+    
+  - cd GatewayTester
+  - make CXX="g++-4.8"
+ 
   
 notifications:
   emails:
diff --git a/MQTTSNGateway/Makefile b/MQTTSNGateway/Makefile
index 3d3608b..0591067 100644
--- a/MQTTSNGateway/Makefile
+++ b/MQTTSNGateway/Makefile
@@ -135,8 +135,6 @@ install:
 	cp -pf $(CLIENTS) ../../
 
 exectest:
-	cp -pf $(CONFIG) $(OUTDIR)
-	cd $(OUTDIR)
-	./$(TESTPROGNAME) -f ./gateway.conf
+	./$(OUTDIR)/$(TESTPROGNAME) -f ./gateway.conf
 
 	
\ No newline at end of file
diff --git a/MQTTSNGateway/src/MQTTSNGWProcess.h b/MQTTSNGateway/src/MQTTSNGWProcess.h
index 21bd6e4..1ff48da 100644
--- a/MQTTSNGateway/src/MQTTSNGWProcess.h
+++ b/MQTTSNGateway/src/MQTTSNGWProcess.h
@@ -257,10 +257,10 @@ private:
 /*=====================================
  Class Tree23
  ====================================*/
-#define TREE23_INSERT_ACTIVE  (1)
-#define TREE23_DELETE_ACTIVE  (2)
-#define TREE23_BI_NODE        (3)
-#define TREE23_TRI_NODE       (4)
+#define TREE23_INSERT_ACTIVE  (-2)
+#define TREE23_DELETE_ACTIVE  (-1)
+#define TREE23_BI_NODE        (2)
+#define TREE23_TRI_NODE       (3)
 
 template <typename K, typename V>
 class Tree23Elm{
diff --git a/MQTTSNGateway/src/tests/TestProcess.cpp b/MQTTSNGateway/src/tests/TestProcess.cpp
index a694c65..5d338cc 100644
--- a/MQTTSNGateway/src/tests/TestProcess.cpp
+++ b/MQTTSNGateway/src/tests/TestProcess.cpp
@@ -29,7 +29,7 @@
 using namespace std;
 using namespace MQTTSNGW;
 
-#define ARGV    "./testPFW"
+#define ARGV    "./Build/testPFW"
 #define CONFDIR "./"
 #define CONF    "gateway.conf"
 
@@ -121,5 +121,5 @@ void TestProcess::run(void)
 		_evQue.post(ev);
 	}
 
-	MultiTaskProcess::run();
+	//MultiTaskProcess::run();
 }
diff --git a/MQTTSNGateway/src/tests/TestTree23.cpp b/MQTTSNGateway/src/tests/TestTree23.cpp
index 03838b1..d455eec 100644
--- a/MQTTSNGateway/src/tests/TestTree23.cpp
+++ b/MQTTSNGateway/src/tests/TestTree23.cpp
@@ -76,7 +76,6 @@ void TestTree23::test(void)
 		assert(rc == false);
 		//printf("key=%d  find=%d\n", i, rc);
 		Integer* val = this->getVal(r1[i]);
-		//printf("key=%d  val=%d\n", i, val->_val);
 		assert(val == 0);
 	}
 	for ( int i = 50; i < N; i++)