diff --git a/tests/xua_unit_tests/src/test_multi_report/test_hid_multi_report.c b/tests/xua_unit_tests/src/test_multi_report/test_hid_multi_report.c
index bad4c699..43dc4d2a 100644
--- a/tests/xua_unit_tests/src/test_multi_report/test_hid_multi_report.c
+++ b/tests/xua_unit_tests/src/test_multi_report/test_hid_multi_report.c
@@ -59,7 +59,7 @@ void test_validate_report( void ) {
 }
 
 void test_reportid_in_use( void ) {
-    unsigned reportIdInUse = hidIsReportIdInUse();
+    unsigned reportIdInUse = hidAreReportIdsInUse();
     TEST_ASSERT_EQUAL_UINT( 1, reportIdInUse );
 }
 
@@ -775,7 +775,6 @@ void test_initial_modification_with_subsequent_verification_2( void )
 //setIdle and associated timing functionality tests
 void test_set_idle( void )
 {
-    unsigned reportIdAll = 0;
     unsigned reportId = 1;
     unsigned reportId2 = 2;
 
@@ -785,23 +784,16 @@ void test_set_idle( void )
     setIdle = hidIsIdleActive( reportId2 );
     TEST_ASSERT_EQUAL_UINT( 0, setIdle );
 
-    setIdle = hidIsIdleActive( reportIdAll );
-    TEST_ASSERT_EQUAL_UINT( 0, setIdle );
-
     hidSetIdle( reportId, 1 );
     setIdle = hidIsIdleActive( reportId );
     TEST_ASSERT_EQUAL_UINT( 1, setIdle );
 
-    setIdle = hidIsIdleActive( reportIdAll );
-    TEST_ASSERT_EQUAL_UINT( 0, setIdle );
-
     setIdle = hidIsIdleActive( reportId2 );
     TEST_ASSERT_EQUAL_UINT( 0, setIdle );
 }
 
 void test_set_all_idle( void )
 {
-    unsigned reportIdAll = 0;
     unsigned reportId = 1;
     unsigned reportId2 = 2;
 
@@ -811,22 +803,14 @@ void test_set_all_idle( void )
     setIdle = hidIsIdleActive( reportId2 ); 
     TEST_ASSERT_EQUAL_UINT( 0, setIdle );
 
-    setIdle = hidIsIdleActive( reportIdAll );
-    TEST_ASSERT_EQUAL_UINT( 0, setIdle );
-
     for ( reportId = 1; reportId <= HID_REPORT_COUNT; ++reportId ) {
         hidSetIdle( reportId, 1 );
         setIdle = hidIsIdleActive( reportId );
         TEST_ASSERT_EQUAL_UINT( 1, setIdle );
-    }
-
-    setIdle = hidIsIdleActive( reportIdAll );
-    TEST_ASSERT_EQUAL_UINT( 1, setIdle );
 }
 
 void test_change_pending( void )
 {
-    unsigned reportIdAll = 0;
     unsigned reportId = 1;
     unsigned reportId2 = 2;
 
@@ -836,39 +820,26 @@ void test_change_pending( void )
     changePending = hidIsChangePending( reportId2 );
     TEST_ASSERT_EQUAL_UINT( 0, changePending );
 
-    changePending = hidIsChangePending( reportIdAll );
-    TEST_ASSERT_EQUAL_UINT( 0, changePending );
-
     hidSetChangePending( reportId );
     changePending = hidIsChangePending( reportId );
     TEST_ASSERT_EQUAL_UINT( 1, changePending );
 
-    changePending = hidIsChangePending( reportIdAll );
-    TEST_ASSERT_EQUAL_UINT( 1, changePending );
-
     changePending = hidIsChangePending( reportId2 );
     TEST_ASSERT_EQUAL_UINT( 0, changePending );
 }
 
 void test_change_pending_all( void )
 {
-    unsigned reportIdAll = 0;
     unsigned reportId = 1;
 
     unsigned changePending = hidIsChangePending( reportId );
     TEST_ASSERT_EQUAL_UINT( 0, changePending );
 
-    changePending = hidIsChangePending( reportIdAll );
-    TEST_ASSERT_EQUAL_UINT( 0, changePending );
-
     for ( reportId = 1; reportId <= HID_REPORT_COUNT; ++reportId ) {
         hidSetChangePending( reportId );
         changePending = hidIsChangePending( reportId );
         TEST_ASSERT_EQUAL_UINT( 1, changePending );
     }
-
-    changePending = hidIsChangePending( reportIdAll );
-    TEST_ASSERT_EQUAL_UINT( 1, changePending );
 }
 
 void test_report_time( void )
diff --git a/tests/xua_unit_tests/src/test_simple/test_hid.c b/tests/xua_unit_tests/src/test_simple/test_hid.c
index 856edd79..b9598643 100644
--- a/tests/xua_unit_tests/src/test_simple/test_hid.c
+++ b/tests/xua_unit_tests/src/test_simple/test_hid.c
@@ -46,7 +46,7 @@ void test_validate_report( void ) {
 }
 
 void test_reportid_in_use( void ) {
-    unsigned reportIdInUse = hidIsReportIdInUse();
+    unsigned reportIdInUse = hidAreReportIdsInUse();
     TEST_ASSERT_EQUAL_UINT( 0, reportIdInUse );
 }