diff --git a/pus_tc/cmd_definitions.py b/pus_tc/cmd_definitions.py
index 685c41a..6344929 100644
--- a/pus_tc/cmd_definitions.py
+++ b/pus_tc/cmd_definitions.py
@@ -21,13 +21,6 @@ def get_eive_service_op_code_dict() -> TmtcDefinitionWrapper:
         info="PUS Service 5 Event",
         op_code_entry=srv_5,
     )
-    srv_17 = OpCodeEntry()
-    srv_17.add("0", "Ping Test")
-    def_wrapper.add_service(
-        name=CoreServiceList.SERVICE_17_ALT,
-        info="PUS Service 17 Test",
-        op_code_entry=srv_17,
-    )
     call_all_definitions_providers(def_wrapper)
     return def_wrapper
 
diff --git a/tmtc/__init__.py b/tmtc/__init__.py
index 8d644b7..841f57c 100644
--- a/tmtc/__init__.py
+++ b/tmtc/__init__.py
@@ -1 +1,2 @@
 from .acs_subsystem import add_acs_subsystem_cmds
+from .test import add_test_defs
diff --git a/tmtc/test.py b/tmtc/test.py
index 7e2778b..75603f6 100644
--- a/tmtc/test.py
+++ b/tmtc/test.py
@@ -23,18 +23,20 @@ class Info:
 
 
 @tmtc_definitions_provider
-def pack_test_cmds(defs: TmtcDefinitionWrapper):
+def add_test_defs(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     oce.add(keys=OpCodes.PING, info=Info.PING)
     oce.add(keys=OpCodes.TRIGGER_EVENT, info=Info.TRIGGER_EVENT)
     oce.add(keys=OpCodes.PING_WITH_DATA, info=Info.PING_WITH_DATA)
 
     defs.add_service(
-        name=CoreServiceList.SERVICE_17, info="PUS 17 Test Service", op_code_entry=oce
+        name=CoreServiceList.SERVICE_17_ALT,
+        info="PUS 17 Test Service",
+        op_code_entry=oce,
     )
 
 
-@service_provider(CoreServiceList.SERVICE_17)
+@service_provider(CoreServiceList.SERVICE_17_ALT)
 def pack_test_command(p: ServiceProviderParams):
     info = p.info
     q = p.queue_helper