diff --git a/lib/core/src/unix/mutex.c b/lib/core/src/unix/mutex.c
index 2210100624..9c38170b11 100644
--- a/lib/core/src/unix/mutex.c
+++ b/lib/core/src/unix/mutex.c
@@ -1,3 +1,5 @@
+#define TRACE_MODULE _mutex
+
 #include "core.h"
 #include "core_arch_mutex.h"
 #include "core_errno.h"
@@ -16,7 +18,7 @@ status_t mutex_init(void)
 
 status_t mutex_final(void)
 {
-    d_print("%d not freed in mutex_pool[%d]\n",
+    d_trace(1, "%d not freed in mutex_pool[%d]\n",
             pool_size(&mutex_pool) - pool_avail(&mutex_pool),
             pool_size(&mutex_pool));
     pool_final(&mutex_pool);
diff --git a/lib/core/src/unix/pkbuf.c b/lib/core/src/unix/pkbuf.c
index 8d79b1a4c8..133d4c72f5 100644
--- a/lib/core/src/unix/pkbuf.c
+++ b/lib/core/src/unix/pkbuf.c
@@ -1,5 +1,6 @@
-#include "core.h"
 #define TRACE_MODULE _pkbuf
+
+#include "core.h"
 #include "core_pkbuf.h"
 #include "core_errno.h"
 #include "core_lib.h"
@@ -82,28 +83,28 @@ status_t pkbuf_final(void)
 
 void pkbuf_show(void)
 {
-    d_print("%d not freed in pkbuf_pool[%d]\n",
+    d_trace(1, "%d not freed in pkbuf_pool[%d]\n",
             pool_size(&pkbuf_pool) - pool_avail(&pkbuf_pool),
             pool_size(&pkbuf_pool));
-    d_print("%d not freed in clbuf_pool[%d]\n",
+    d_trace(1, "%d not freed in clbuf_pool[%d]\n",
             pool_size(&clbuf_pool) - pool_avail(&clbuf_pool),
             pool_size(&clbuf_pool));
-    d_print("%d not freed in cluster128_pool[%d]\n",
+    d_trace(1, "%d not freed in cluster128_pool[%d]\n",
             pool_size(&cluster_128_pool) - pool_avail(&cluster_128_pool),
             pool_size(&cluster_128_pool));
-    d_print("%d not freed in cluster256_pool[%d]\n",
+    d_trace(1, "%d not freed in cluster256_pool[%d]\n",
             pool_size(&cluster_256_pool) - pool_avail(&cluster_256_pool),
             pool_size(&cluster_256_pool));
-    d_print("%d not freed in cluster512_pool[%d]\n",
+    d_trace(1, "%d not freed in cluster512_pool[%d]\n",
             pool_size(&cluster_512_pool) - pool_avail(&cluster_512_pool),
             pool_size(&cluster_512_pool));
-    d_print("%d not freed in cluster1024_pool[%d]\n",
+    d_trace(1, "%d not freed in cluster1024_pool[%d]\n",
             pool_size(&cluster_1024_pool) - pool_avail(&cluster_1024_pool),
             pool_size(&cluster_1024_pool));
-    d_print("%d not freed in cluster2048_pool[%d]\n",
+    d_trace(1, "%d not freed in cluster2048_pool[%d]\n",
             pool_size(&cluster_2048_pool) - pool_avail(&cluster_2048_pool),
             pool_size(&cluster_2048_pool));
-    d_print("%d not freed in cluster8192_pool[%d]\n",
+    d_trace(1, "%d not freed in cluster8192_pool[%d]\n",
             pool_size(&cluster_8192_pool) - pool_avail(&cluster_8192_pool),
             pool_size(&cluster_8192_pool));
 }
diff --git a/lib/gtp/gtp_xact.c b/lib/gtp/gtp_xact.c
index 0a929a729a..ca81d261d7 100644
--- a/lib/gtp/gtp_xact.c
+++ b/lib/gtp/gtp_xact.c
@@ -67,7 +67,7 @@ status_t gtp_xact_final(void)
     if (gtp_xact_pool_initialized == 1 && 
         pool_size(&gtp_xact_pool) == pool_avail(&gtp_xact_pool))
     {
-        d_print("%d not freed in gtp_xact_pool[%d] of GTP Transaction\n",
+        d_trace(1, "%d not freed in gtp_xact_pool[%d] of GTP Transaction\n",
                 pool_size(&gtp_xact_pool) - pool_avail(&gtp_xact_pool),
                 pool_size(&gtp_xact_pool));
         index_final(&gtp_xact_pool);
diff --git a/src/hss/hss_context.c b/src/hss/hss_context.c
index 49d2df7c70..a1c1749a54 100644
--- a/src/hss/hss_context.c
+++ b/src/hss/hss_context.c
@@ -299,6 +299,11 @@ status_t hss_context_setup_trace_module()
 
     if (others)
     {
+        extern int _mutex;
+        d_trace_level(&_mutex, others);
+        extern int _pkbuf;
+        d_trace_level(&_pkbuf, others);
+
         extern int _context;
         d_trace_level(&_context, others);
         extern int _hss_context;
diff --git a/src/mme/emm_sm.c b/src/mme/emm_sm.c
index 1474afdd0e..7bca3a4b51 100644
--- a/src/mme/emm_sm.c
+++ b/src/mme/emm_sm.c
@@ -14,7 +14,7 @@ void emm_state_initial(fsm_t *s, event_t *e)
 {
     d_assert(s, return, "Null param");
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 
     FSM_TRAN(s, &emm_state_operational);
 }
@@ -23,7 +23,7 @@ void emm_state_final(fsm_t *s, event_t *e)
 {
     d_assert(s, return, "Null param");
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 }
 
 void emm_state_operational(fsm_t *s, event_t *e)
@@ -31,7 +31,7 @@ void emm_state_operational(fsm_t *s, event_t *e)
     d_assert(s, return, "Null param");
     d_assert(e, return, "Null param");
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 
     switch (event_get(e))
     {
@@ -221,7 +221,7 @@ void emm_state_exception(fsm_t *s, event_t *e)
     d_assert(s, return, "Null param");
     d_assert(e, return, "Null param");
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 
     switch (event_get(e))
     {
diff --git a/src/mme/esm_sm.c b/src/mme/esm_sm.c
index 323db08b28..7b6b02a99a 100644
--- a/src/mme/esm_sm.c
+++ b/src/mme/esm_sm.c
@@ -12,7 +12,7 @@ void esm_state_initial(fsm_t *s, event_t *e)
 {
     d_assert(s, return, "Null param");
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 
     FSM_TRAN(s, &esm_state_operational);
 }
@@ -21,7 +21,7 @@ void esm_state_final(fsm_t *s, event_t *e)
 {
     d_assert(s, return, "Null param");
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 }
 
 void esm_state_operational(fsm_t *s, event_t *e)
@@ -29,7 +29,7 @@ void esm_state_operational(fsm_t *s, event_t *e)
     d_assert(s, return, "Null param");
     d_assert(e, return, "Null param");
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 
     switch (event_get(e))
     {
@@ -144,7 +144,7 @@ void esm_state_exception(fsm_t *s, event_t *e)
     d_assert(s, return, "Null param");
     d_assert(e, return, "Null param");
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 
     switch (event_get(e))
     {
diff --git a/src/mme/mme_context.c b/src/mme/mme_context.c
index c074c41160..9ad6f63695 100644
--- a/src/mme/mme_context.c
+++ b/src/mme/mme_context.c
@@ -852,6 +852,11 @@ status_t mme_context_setup_trace_module()
 
     if (others)
     {
+        extern int _mutex;
+        d_trace_level(&_mutex, others);
+        extern int _pkbuf;
+        d_trace_level(&_pkbuf, others);
+
         extern int _context;
         d_trace_level(&_context, others);
         extern int _mme_context;
diff --git a/src/mme/mme_s6a_handler.c b/src/mme/mme_s6a_handler.c
index 515b676f5d..59be486f26 100644
--- a/src/mme/mme_s6a_handler.c
+++ b/src/mme/mme_s6a_handler.c
@@ -605,7 +605,7 @@ void mme_s6a_final(void)
 {
 	d_assert(fd_sess_handler_destroy(&mme_s6a_reg, NULL) == 0,,);
 
-    d_print("%d not freed in sess_state_pool[%d] of S6A-SM\n",
+    d_trace(1, "%d not freed in sess_state_pool[%d] of S6A-SM\n",
             pool_size(&sess_state_pool) - pool_avail(&sess_state_pool),
             pool_size(&sess_state_pool));
 
diff --git a/src/mme/mme_sm.c b/src/mme/mme_sm.c
index 0143bdb76f..4e9f83eb3e 100644
--- a/src/mme/mme_sm.c
+++ b/src/mme/mme_sm.c
@@ -14,7 +14,7 @@
 
 void mme_state_initial(fsm_t *s, event_t *e)
 {
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 
     d_assert(s, return, "Null param");
 
@@ -23,7 +23,7 @@ void mme_state_initial(fsm_t *s, event_t *e)
 
 void mme_state_final(fsm_t *s, event_t *e)
 {
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 
     d_assert(s, return, "Null param");
 }
@@ -35,7 +35,7 @@ void mme_state_operational(fsm_t *s, event_t *e)
     status_t rv;
     char buf[INET_ADDRSTRLEN];
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 
     d_assert(s, return, "Null param");
 
diff --git a/src/mme/s1ap_handler.c b/src/mme/s1ap_handler.c
index 9f56f3ff5e..c2f27e3816 100644
--- a/src/mme/s1ap_handler.c
+++ b/src/mme/s1ap_handler.c
@@ -153,7 +153,7 @@ void s1ap_handle_s1_setup_request(mme_enb_t *enb, s1ap_message_t *message)
     }
 #endif
     d_assert(enb->s1ap_sock, return,);
-    d_trace(1, "[S1AP] S1SetupRequest : eNB[%s:%d] --> MME\n",
+    d_trace(3, "[S1AP] S1SetupRequest : eNB[%s:%d] --> MME\n",
         INET_NTOP(&enb->s1ap_sock->remote.sin_addr.s_addr, buf),
         enb_id);
 
@@ -164,7 +164,7 @@ void s1ap_handle_s1_setup_request(mme_enb_t *enb, s1ap_message_t *message)
     d_assert(s1ap_send_to_enb(enb, s1apbuf) == CORE_OK, , "send error");
 
     d_assert(enb->s1ap_sock, return,);
-    d_trace(1, "[S1AP] S1SetupResponse: eNB[%s:%d] <-- MME\n",
+    d_trace(3, "[S1AP] S1SetupResponse: eNB[%s:%d] <-- MME\n",
         INET_NTOP(&enb->s1ap_sock->remote.sin_addr.s_addr, buf),
         enb_id);
 }
diff --git a/src/mme/s1ap_sm.c b/src/mme/s1ap_sm.c
index 0f17d916b4..a218769ecd 100644
--- a/src/mme/s1ap_sm.c
+++ b/src/mme/s1ap_sm.c
@@ -14,7 +14,7 @@ void s1ap_state_initial(fsm_t *s, event_t *e)
 {
     d_assert(s, return, "Null param");
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 
     FSM_TRAN(s, &s1ap_state_operational);
 }
@@ -23,7 +23,7 @@ void s1ap_state_final(fsm_t *s, event_t *e)
 {
     d_assert(s, return, "Null param");
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 }
 
 void s1ap_state_operational(fsm_t *s, event_t *e)
@@ -31,7 +31,7 @@ void s1ap_state_operational(fsm_t *s, event_t *e)
     d_assert(s, return, "Null param");
     d_assert(e, return, "Null param");
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 
     switch (event_get(e))
     {
@@ -203,7 +203,7 @@ void s1ap_state_exception(fsm_t *s, event_t *e)
     d_assert(s, return, "Null param");
     d_assert(e, return, "Null param");
 
-    mme_sm_trace(1, e);
+    mme_sm_trace(3, e);
 
     switch (event_get(e))
     {
diff --git a/src/pgw/pgw_context.c b/src/pgw/pgw_context.c
index 0a5ca75585..8e98738539 100644
--- a/src/pgw/pgw_context.c
+++ b/src/pgw/pgw_context.c
@@ -49,10 +49,10 @@ status_t pgw_context_final()
     gtp_xact_delete_all(&self.s5c_node);
     pgw_sess_remove_all();
 
-    d_print("%d not freed in pgw_sess_pool[%d] in PGW-Context\n",
+    d_trace(1, "%d not freed in pgw_sess_pool[%d] in PGW-Context\n",
             index_size(&pgw_sess_pool) - pool_avail(&pgw_sess_pool),
             index_size(&pgw_sess_pool));
-    d_print("%d not freed in pgw_ip_pool[%d] in PGW-Context\n",
+    d_trace(1, "%d not freed in pgw_ip_pool[%d] in PGW-Context\n",
             index_size(&pgw_ip_pool_pool) - pool_avail(&pgw_ip_pool_pool),
             index_size(&pgw_ip_pool_pool));
 
@@ -420,6 +420,11 @@ status_t pgw_context_setup_trace_module()
 
     if (others)
     {
+        extern int _mutex;
+        d_trace_level(&_mutex, others);
+        extern int _pkbuf;
+        d_trace_level(&_pkbuf, others);
+
         extern int _context;
         d_trace_level(&_context, others);
         extern int _pgw_context;
diff --git a/src/pgw/pgw_sm.c b/src/pgw/pgw_sm.c
index 64a2bb7bc1..3364758516 100644
--- a/src/pgw/pgw_sm.c
+++ b/src/pgw/pgw_sm.c
@@ -9,7 +9,7 @@
 
 void pgw_state_initial(fsm_t *s, event_t *e)
 {
-    pgw_sm_trace(1, e);
+    pgw_sm_trace(3, e);
 
     d_assert(s, return, "Null param");
 
@@ -18,7 +18,7 @@ void pgw_state_initial(fsm_t *s, event_t *e)
 
 void pgw_state_final(fsm_t *s, event_t *e)
 {
-    pgw_sm_trace(1, e);
+    pgw_sm_trace(3, e);
 
     d_assert(s, return, "Null param");
 }
@@ -27,7 +27,7 @@ void pgw_state_operational(fsm_t *s, event_t *e)
 {
     status_t rv;
 
-    pgw_sm_trace(1, e);
+    pgw_sm_trace(3, e);
 
     d_assert(s, return, "Null param");
 
diff --git a/src/sgw/sgw_context.c b/src/sgw/sgw_context.c
index 46ab88afb6..3246d0acc4 100644
--- a/src/sgw/sgw_context.c
+++ b/src/sgw/sgw_context.c
@@ -50,7 +50,7 @@ status_t sgw_context_final()
 
     sgw_sess_remove_all();
 
-    d_print("%d not freed in sgw_sess_pool[%d] in SGW-Context\n",
+    d_trace(1, "%d not freed in sgw_sess_pool[%d] in SGW-Context\n",
             index_size(&sgw_sess_pool) - pool_avail(&sgw_sess_pool),
             index_size(&sgw_sess_pool));
     index_final(&sgw_bearer_pool);
@@ -412,6 +412,11 @@ status_t sgw_context_setup_trace_module()
 
     if (others)
     {
+        extern int _mutex;
+        d_trace_level(&_mutex, others);
+        extern int _pkbuf;
+        d_trace_level(&_pkbuf, others);
+
         extern int _context;
         d_trace_level(&_context, others);
         extern int _sgw_context;
diff --git a/src/sgw/sgw_sm.c b/src/sgw/sgw_sm.c
index f0d661ad96..12d9118099 100644
--- a/src/sgw/sgw_sm.c
+++ b/src/sgw/sgw_sm.c
@@ -8,7 +8,7 @@
 
 void sgw_state_initial(fsm_t *s, event_t *e)
 {
-    sgw_sm_trace(1, e);
+    sgw_sm_trace(3, e);
 
     d_assert(s, return, "Null param");
 
@@ -17,7 +17,7 @@ void sgw_state_initial(fsm_t *s, event_t *e)
 
 void sgw_state_final(fsm_t *s, event_t *e)
 {
-    sgw_sm_trace(1, e);
+    sgw_sm_trace(3, e);
 
     d_assert(s, return, "Null param");
 }
@@ -26,7 +26,7 @@ void sgw_state_operational(fsm_t *s, event_t *e)
 {
     status_t rv;
 
-    sgw_sm_trace(1, e);
+    sgw_sm_trace(3, e);
 
     d_assert(s, return, "Null param");
 
diff --git a/test/abts.c b/test/abts.c
index 45db16668e..76de771ca1 100644
--- a/test/abts.c
+++ b/test/abts.c
@@ -429,8 +429,8 @@ int main(int argc, const char *const argv[]) {
     int list_provided = 0;
     abts_suite *suite = NULL;
 
-    d_trace_global_off();
     test_initialize();
+    d_trace_global_off();
 
     quiet = !isatty(STDOUT_FILENO);
 
diff --git a/test/testutil.c b/test/testutil.c
index d82c748f26..1dd8b409ec 100644
--- a/test/testutil.c
+++ b/test/testutil.c
@@ -55,6 +55,8 @@ static void test_s6a_hook_handler(enum fd_hook_type type, struct msg * msg,
 
 void test_terminate(void)
 {
+    d_trace_global_on();
+
     app_terminate();
     core_terminate();
 }