diff --git a/include/dsd.h b/include/dsd.h
index fbe0a0d..7cf1e2e 100644
--- a/include/dsd.h
+++ b/include/dsd.h
@@ -770,7 +770,7 @@ typedef struct
   #define EDACS_IS_INDIVIDUAL   0x10
   #define EDACS_IS_ALL_CALL     0x20
   #define EDACS_IS_INTERCONNECT 0x40
-  #define EDACS_IS_TESTCALL     0x100
+  #define EDACS_IS_TEST_CALL    0x80
 
   //trunking group and lcn freq list
   long int trunk_lcn_freq[26]; //max number on an EDACS system, should be enough on DMR too hopefully
diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
index f1e675d..201025d 100644
--- a/src/dsd_ncurses.c
+++ b/src/dsd_ncurses.c
@@ -3621,14 +3621,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
             else if ((call_matrix[i][4] & EDACS_IS_INTERCONNECT) != 0)
               printw (" TGT [ SYSTEM ] SRC [%8lld] Interconnect", call_matrix[i][3] );
             // Test call
-            else if ((call_matrix[i][4] & EDACS_IS_TESTCALL) != 0)
+            else if ((call_matrix[i][4] & EDACS_IS_TEST_CALL) != 0)
               printw (" TEST CALL");
             // Unknown call
             else
               printw (" Unknown call type" );
 
             // Call flags
-            if ((call_matrix[i][4] & EDACS_IS_TESTCALL) != 0) {}
+            if ((call_matrix[i][4] & EDACS_IS_TEST_CALL) != 0) {}
             else if ((call_matrix[i][4] & EDACS_IS_DIGITAL) == 0)   printw (" [Ana]");
             else                                                    printw (" [Dig]");
             if ((call_matrix[i][4] & EDACS_IS_EMERGENCY) != 0)      printw ("[EM]");
@@ -3655,14 +3655,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
             else if ((call_matrix[i][4] & EDACS_IS_INTERCONNECT) != 0)
               printw (" TGT [    SYSTEM    ] SRC [%5lld] Interconnect", call_matrix[i][3] );
             // Test call
-            else if ((call_matrix[i][4] & EDACS_IS_TESTCALL) != 0)
+            else if ((call_matrix[i][4] & EDACS_IS_TEST_CALL) != 0)
               printw (" TEST CALL");
             // Unknown call
             else
               printw (" Unknown call type" );
 
             // Call flags
-            if ((call_matrix[i][4] & EDACS_IS_TESTCALL) != 0) {}
+            if ((call_matrix[i][4] & EDACS_IS_TEST_CALL) != 0) {}
             else if ((call_matrix[i][4] & EDACS_IS_DIGITAL) == 0)   printw (" [Ana]");
             else                                                    printw (" [Dig]");
             if ((call_matrix[i][4] & EDACS_IS_EMERGENCY) != 0)      printw ("[EM]");
@@ -3814,14 +3814,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
               else if ((call_matrix[j][4] & EDACS_IS_INTERCONNECT) != 0)
                 printw ("Target [ SYSTEM ] Source [%8lld] Interconnect", call_matrix[j][3]);
               // Test call
-              else if ((call_matrix[j][4] & EDACS_IS_TESTCALL) != 0)
+              else if ((call_matrix[j][4] & EDACS_IS_TEST_CALL) != 0)
                 printw ("TEST CALL");
               // Unknown call
               else
                 printw ("Unknown call type");
 
               // Call flags
-              if ((call_matrix[j][4] & EDACS_IS_TESTCALL) != 0) {}
+              if ((call_matrix[j][4] & EDACS_IS_TEST_CALL) != 0) {}
               else if ((call_matrix[j][4] & EDACS_IS_DIGITAL) == 0)   printw (" [Ana]");
               else                                                    printw (" [Dig]");
               if ((call_matrix[j][4] & EDACS_IS_EMERGENCY) != 0)      printw ("[EM]");
@@ -3853,14 +3853,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
               else if ((call_matrix[j][4] & EDACS_IS_INTERCONNECT) != 0)
                 printw ("Target [    SYSTEM    ] Source [%5lld] Interconnect", call_matrix[j][3]);
               // Test call
-              else if ((call_matrix[i][4] & EDACS_IS_TESTCALL) != 0)
+              else if ((call_matrix[i][4] & EDACS_IS_TEST_CALL) != 0)
                 printw (" TEST CALL");
               // Unknown call
               else
                 printw ("Unknown call type");
 
               // Call flags
-              if ((call_matrix[i][4] & EDACS_IS_TESTCALL) != 0) {}
+              if ((call_matrix[i][4] & EDACS_IS_TEST_CALL) != 0) {}
               else if ((call_matrix[j][4] & EDACS_IS_DIGITAL) == 0)   printw (" [Ana]");
               else                                                    printw (" [Dig]");
               if ((call_matrix[j][4] & EDACS_IS_EMERGENCY) != 0)      printw ("[EM]");
diff --git a/src/edacs-fme.c b/src/edacs-fme.c
index 894b385..69752d3 100644
--- a/src/edacs-fme.c
+++ b/src/edacs-fme.c
@@ -625,7 +625,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
           //and overwrite current values in the matrix
           state->lasttg  = 999999999;
           state->lastsrc = 999999999;
-          state->edacs_vc_call_type = 0x101; //manually set to 0x101 to trigger voice call in ncurses, but no other flags
+          state->edacs_vc_call_type = EDACS_IS_TEST_CALL | EDACS_IS_VOICE; //manually set to trigger voice call in ncurses, but no other flags
         }
         //Adjacent Sites
         else if (mt2 == 0x1)
@@ -1022,7 +1022,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
           //and overwrite current values in the matrix
           state->lasttg  = 999999999;
           state->lastsrc = 999999999;
-          state->edacs_vc_call_type = 0x101; //manually set to 0x101 to trigger voice call in ncurses, but no other flags
+          state->edacs_vc_call_type = EDACS_IS_TEST_CALL | EDACS_IS_VOICE; //manually set to trigger voice call in ncurses, but no other flags
           lcn = 0; //set to zero here, because this is not an actual call, so don't tune to it
         }
         else