diff --git a/MQTTSNGateway/GatewayTester/samples/ClientPub/mainPub.cpp b/MQTTSNGateway/GatewayTester/samples/ClientPub/mainPub.cpp
index c9a571c..9b6b78e 100644
--- a/MQTTSNGateway/GatewayTester/samples/ClientPub/mainPub.cpp
+++ b/MQTTSNGateway/GatewayTester/samples/ClientPub/mainPub.cpp
@@ -117,7 +117,7 @@ void publishTopic57(void)
     char payload[300];
     sprintf(payload, "publish \"ty4tw/topic57\" \n");
     uint8_t qos = 0;
-    PUBLISH(topic2,(uint8_t*)payload, strlen(payload), qos);
+	PUBLISH(topic57, (uint8_t* )payload, strlen(payload), qos);
 }
 
 
diff --git a/MQTTSNGateway/GatewayTester/samples/mainTest.cpp b/MQTTSNGateway/GatewayTester/samples/mainTest.cpp
index 6d0c426..c091ec3 100644
--- a/MQTTSNGateway/GatewayTester/samples/mainTest.cpp
+++ b/MQTTSNGateway/GatewayTester/samples/mainTest.cpp
@@ -136,13 +136,13 @@ SUBSCRIBE_LIST =
  *------------------------------------------------------*/
 void subscribePredefTopic1(void)
 {
-	SUBSCRIBE(1, on_Topic03, QoS1);
+	SUBSCRIBE_PREDEF(1, on_Topic03, QoS1);
 }
 
 void publishTopic1(void)
 {
 	char payload[300];
-	sprintf(payload, "publish \"ty4tw/Topic1\" \n");
+	sprintf(payload, "publish \"ty4tw/topic1\" \n");
 	PUBLISH(topic1, (uint8_t* )payload, strlen(payload), QoS0);
 }
 
@@ -162,12 +162,12 @@ void publishTopic4(void)
 
 void subscribeTopic10(void)
 {
-	SUBSCRIBE(10, on_Topic02, QoS1);
+	SUBSCRIBE_PREDEF(10, on_Topic02, QoS1);
 }
 
 void subscribeWildcardTopic(void)
 {
-	SUBSCRIBE(topic40, on_Topic04, QoS1);
+	SUBSCRIBE(topic50, on_TopicWildcard, QoS1);
 }
 
 
@@ -239,10 +239,9 @@ TEST_LIST =
 	TEST("Step9:subscribe again", subscribechangeCallback),
 	TEST("Step10:Publish topic2", publishTopic2),
 
-	TEST("Step10:Reset Clean Session", CleanSessionOff),
+	//TEST("Step10:Reset Clean Session", CleanSessionOff),
 
-	// SUBSCRIBE wildcard topic topic4
-	TEST("Step9:subscribe wildcard topic", subscribechangeCallback),
+	//TEST("Step9:subscribe wildcard topic", subscribechangeCallback),
 
 	TEST("Step11:Sleep     ", asleep),
 	TEST("Step12:Publish topic1", publishTopic1),
diff --git a/MQTTSNGateway/GatewayTester/src/LGwProxy.cpp b/MQTTSNGateway/GatewayTester/src/LGwProxy.cpp
index 9ff58ae..0a79cbe 100644
--- a/MQTTSNGateway/GatewayTester/src/LGwProxy.cpp
+++ b/MQTTSNGateway/GatewayTester/src/LGwProxy.cpp
@@ -687,7 +687,7 @@ void LGwProxy::setAutoConnectMode(bool valid)
 	_isAutoConnectMode = valid;
 }
 
-void LGwProxy::setCleanSession(bool valid)
+void LGwProxy::setSessionMode(bool valid)
 {
 	_cleanSession = valid;
 }
diff --git a/MQTTSNGateway/GatewayTester/src/LGwProxy.h b/MQTTSNGateway/GatewayTester/src/LGwProxy.h
index dcd8415..659b662 100644
--- a/MQTTSNGateway/GatewayTester/src/LGwProxy.h
+++ b/MQTTSNGateway/GatewayTester/src/LGwProxy.h
@@ -69,7 +69,7 @@ public:
     void     setQoSMinus1Mode(bool valid);
 	void     setPingReqMode(bool valid);
 	void     setAutoConnectMode(bool valid);
-	void     setCleanSession(bool valid);
+	void     setSessionMode(bool valid);
     void     reconnect(void);
     int      writeMsg(const uint8_t* msg);
     void     setPingReqTimer(void);
diff --git a/MQTTSNGateway/GatewayTester/src/LMqttsnClient.cpp b/MQTTSNGateway/GatewayTester/src/LMqttsnClient.cpp
index 2982060..f467a9f 100644
--- a/MQTTSNGateway/GatewayTester/src/LMqttsnClient.cpp
+++ b/MQTTSNGateway/GatewayTester/src/LMqttsnClient.cpp
@@ -185,9 +185,10 @@ void LMqttsnClient::subscribe(const char* topicName, TopicCallback onPublish, ui
 	_subMgr.subscribe(topicName, onPublish, qos);
 }
 
-void LMqttsnClient::subscribe(uint16_t topicId, TopicCallback onPublish, uint8_t qos)
+void LMqttsnClient::subscribePredefinedId(uint16_t topicId, TopicCallback onPublish,
+		uint8_t qos)
 {
-	_subMgr.subscribe(topicId, onPublish, qos);
+	_subMgr.subscribePredefinedId(topicId, onPublish, qos);
 }
 
 void LMqttsnClient::unsubscribe(const char* topicName)
diff --git a/MQTTSNGateway/GatewayTester/src/LMqttsnClient.h b/MQTTSNGateway/GatewayTester/src/LMqttsnClient.h
index ce152ef..de72eb9 100644
--- a/MQTTSNGateway/GatewayTester/src/LMqttsnClient.h
+++ b/MQTTSNGateway/GatewayTester/src/LMqttsnClient.h
@@ -54,7 +54,7 @@ public:
     void publish(uint16_t topicId, Payload* payload, uint8_t qos, bool retain = false);
     void publish(uint16_t topicId, uint8_t* payload, uint16_t len, uint8_t qos, bool retain = false);
     void subscribe(const char* topicName, TopicCallback onPublish, uint8_t qos);
-    void subscribe(uint16_t topicId, TopicCallback onPublish, uint8_t qos);
+    void subscribePredefinedId(uint16_t topicId, TopicCallback onPublish, uint8_t qos);
     void unsubscribe(const char* topicName);
     void unsubscribe(const uint16_t topicId);
     void disconnect(uint16_t sleepInSecs);
diff --git a/MQTTSNGateway/GatewayTester/src/LMqttsnClientApp.h b/MQTTSNGateway/GatewayTester/src/LMqttsnClientApp.h
index 54d216b..06bd545 100644
--- a/MQTTSNGateway/GatewayTester/src/LMqttsnClientApp.h
+++ b/MQTTSNGateway/GatewayTester/src/LMqttsnClientApp.h
@@ -90,6 +90,7 @@ typedef enum
 #define CONNECT(...) theClient->getGwProxy()->connect(__VA_ARGS__)
 #define PUBLISH(...)     theClient->publish(__VA_ARGS__)
 #define SUBSCRIBE(...)   theClient->subscribe(__VA_ARGS__)
+#define SUBSCRIBE_PREDEF(...)   theClient->subscribePredefinedId(__VA_ARGS__)
 #define UNSUBSCRIBE(...) theClient->unsubscribe(__VA_ARGS__)
 #define DISCONNECT(...)  theClient->disconnect(__VA_ARGS__)
 #define ONCONNECT() theClient->getSubscribeManager()->onConnect()
@@ -110,7 +111,7 @@ typedef enum
 #define SetQoSMinus1Mode(...) theClient->getGwProxy()->setQoSMinus1Mode(__VA_ARGS__)
 #define SetAutoConnectMode(...) theClient->setAutoConnectMode(__VA_ARGS__)
 #define SetAutoPingReqMode(...) theClient->getGwProxy()->setPingReqMode(__VA_ARGS__)
-#define SetCleanSessionMode(...) theClient->getGwProxy()->setCleanSession(__VA_ARGS__)
+#define SetCleanSession(...) theClient->getGwProxy()->setSessionMode(__VA_ARGS__)
 #ifdef CLIENT_MODE
 #define DISPLAY(...)
 #define PROMPT(...)
diff --git a/MQTTSNGateway/GatewayTester/src/LSubscribeManager.cpp b/MQTTSNGateway/GatewayTester/src/LSubscribeManager.cpp
index 03a4bbf..8630c29 100644
--- a/MQTTSNGateway/GatewayTester/src/LSubscribeManager.cpp
+++ b/MQTTSNGateway/GatewayTester/src/LSubscribeManager.cpp
@@ -67,7 +67,9 @@ void LSubscribeManager::onConnect(void)
         {
             if ( theOnPublishList[i].type == MQTTSN_TOPIC_TYPE_PREDEFINED)
             {
-                subscribe(theOnPublishList[i].id, theOnPublishList[i].pubCallback, theOnPublishList[i].qos);
+				subscribePredefinedId(theOnPublishList[i].id,
+						theOnPublishList[i].pubCallback,
+						theOnPublishList[i].qos);
             }
             else
             {
@@ -170,7 +172,7 @@ void LSubscribeManager::subscribe(const char* topicName, TopicCallback onPublish
     send(elm);
 }
 
-void LSubscribeManager::subscribe(uint16_t topicId, TopicCallback onPublish, uint8_t qos)
+void LSubscribeManager::subscribePredefinedId(uint16_t topicId, TopicCallback onPublish, uint8_t qos)
 {
     SubElement* elm = add(MQTTSN_TYPE_SUBSCRIBE, 0, MQTTSN_TOPIC_TYPE_PREDEFINED, topicId,  qos, onPublish);
     send(elm);
@@ -263,7 +265,9 @@ void LSubscribeManager::responce(const uint8_t* msg)
         }
         else
         {
-            DISPLAY("\033[0m\033[0;31m UNSUBACK Invalid messageId. \033[0m\033[0;37m\n\n");
+			DISPLAY(
+					"\033[0m\033[0;31m UNSUBACK Invalid messageId=%04x. \033[0m\033[0;37m\n\n",
+					msgId);
         }
     }
 }
diff --git a/MQTTSNGateway/GatewayTester/src/LSubscribeManager.h b/MQTTSNGateway/GatewayTester/src/LSubscribeManager.h
index 1db3617..6c56055 100644
--- a/MQTTSNGateway/GatewayTester/src/LSubscribeManager.h
+++ b/MQTTSNGateway/GatewayTester/src/LSubscribeManager.h
@@ -56,7 +56,7 @@ public:
     ~LSubscribeManager();
     void onConnect(void);
     void subscribe(const char* topicName, TopicCallback onPublish, uint8_t qos);
-    void subscribe(uint16_t topicId, TopicCallback onPublish, uint8_t qos);
+	void subscribePredefinedId(uint16_t topicId, TopicCallback onPublish, uint8_t qos);
     void unsubscribe(const char* topicName);
     void unsubscribe(uint16_t topicId);
     void responce(const uint8_t* msg);