diff --git a/projects/hip-tests/catch/unit/cooperativeGrps/coalesced_tiled_groups_metagrp.cc b/projects/hip-tests/catch/unit/cooperativeGrps/coalesced_tiled_groups_metagrp.cc
index a7f9ddc7e7..b3dbe4d0e2 100644
--- a/projects/hip-tests/catch/unit/cooperativeGrps/coalesced_tiled_groups_metagrp.cc
+++ b/projects/hip-tests/catch/unit/cooperativeGrps/coalesced_tiled_groups_metagrp.cc
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 #include <hip_test_common.hh>
 #include <hip/hip_cooperative_groups.h>
-#include <hip_test_defgroups.hh>
+ 
 
 /**
  * @addtogroup coalesced_group thread_block_tile
diff --git a/projects/hip-tests/catch/unit/dynamicLoading/complex_loading_behavior.cc b/projects/hip-tests/catch/unit/dynamicLoading/complex_loading_behavior.cc
index c1c412052f..663ce7f5a1 100644
--- a/projects/hip-tests/catch/unit/dynamicLoading/complex_loading_behavior.cc
+++ b/projects/hip-tests/catch/unit/dynamicLoading/complex_loading_behavior.cc
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 #include <hip_test_common.hh>
 #include <dlfcn.h>
-#include <hip_test_defgroups.hh>
+ 
 /**
 * @addtogroup hipLaunchKernelGGL hipLaunchCooperativeKernel
 * @{
diff --git a/projects/hip-tests/catch/unit/dynamicLoading/hipApiDynamicLoad.cc b/projects/hip-tests/catch/unit/dynamicLoading/hipApiDynamicLoad.cc
index e583f4a3d1..b09300bfea 100644
--- a/projects/hip-tests/catch/unit/dynamicLoading/hipApiDynamicLoad.cc
+++ b/projects/hip-tests/catch/unit/dynamicLoading/hipApiDynamicLoad.cc
@@ -17,7 +17,7 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 #include <stdio.h>
 #include <dlfcn.h>
 #include <vector>
diff --git a/projects/hip-tests/catch/unit/event/hipEventCreateWithFlags.cc b/projects/hip-tests/catch/unit/event/hipEventCreateWithFlags.cc
index 875d7f4295..cb3e0d4ed5 100644
--- a/projects/hip-tests/catch/unit/event/hipEventCreateWithFlags.cc
+++ b/projects/hip-tests/catch/unit/event/hipEventCreateWithFlags.cc
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 #include <hip_test_common.hh>
 #include <hip_test_kernels.hh>
-#include <hip_test_defgroups.hh>
+ 
 #include <stdlib.h>
 
 constexpr size_t buffer_size = (1024*1024);
diff --git a/projects/hip-tests/catch/unit/g++/hipMalloc.cc b/projects/hip-tests/catch/unit/g++/hipMalloc.cc
index 22e3141c0e..c0ee9d0892 100644
--- a/projects/hip-tests/catch/unit/g++/hipMalloc.cc
+++ b/projects/hip-tests/catch/unit/g++/hipMalloc.cc
@@ -18,7 +18,7 @@
  * */
 
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 #include "hipMalloc.h"
 /**
  * @addtogroup hipMalloc hipMalloc
diff --git a/projects/hip-tests/catch/unit/gcc/gccTest.cc b/projects/hip-tests/catch/unit/gcc/gccTest.cc
index 6c64553558..6332540682 100644
--- a/projects/hip-tests/catch/unit/gcc/gccTest.cc
+++ b/projects/hip-tests/catch/unit/gcc/gccTest.cc
@@ -18,7 +18,7 @@
  * */
 
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 extern "C" {
 #include "LaunchKernel.h"
 }
diff --git a/projects/hip-tests/catch/unit/graph/hipGraphAddDependencies.cc b/projects/hip-tests/catch/unit/graph/hipGraphAddDependencies.cc
index 0102d90ca9..1281581f89 100644
--- a/projects/hip-tests/catch/unit/graph/hipGraphAddDependencies.cc
+++ b/projects/hip-tests/catch/unit/graph/hipGraphAddDependencies.cc
@@ -20,7 +20,7 @@ THE SOFTWARE.
 #include <hip_test_common.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_kernels.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #include "graph_dependency_common.hh"
 
diff --git a/projects/hip-tests/catch/unit/graph/hipGraphAddKernelNode.cc b/projects/hip-tests/catch/unit/graph/hipGraphAddKernelNode.cc
index 9f030c9807..dd6d9f6960 100644
--- a/projects/hip-tests/catch/unit/graph/hipGraphAddKernelNode.cc
+++ b/projects/hip-tests/catch/unit/graph/hipGraphAddKernelNode.cc
@@ -21,7 +21,7 @@ THE SOFTWARE.
 #include <hip_test_common.hh>
 #include <hip_test_kernels.hh>
 #include <hip_test_checkers.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #define CODEOBJ_FILE "add_Kernel.code"
 #define KERNEL_NAME "Add"
diff --git a/projects/hip-tests/catch/unit/graph/hipGraphGetEdges.cc b/projects/hip-tests/catch/unit/graph/hipGraphGetEdges.cc
index e2a863ef04..408ba88884 100644
--- a/projects/hip-tests/catch/unit/graph/hipGraphGetEdges.cc
+++ b/projects/hip-tests/catch/unit/graph/hipGraphGetEdges.cc
@@ -20,7 +20,7 @@ THE SOFTWARE.
 #include <hip_test_common.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_kernels.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #include "graph_dependency_common.hh"
 
diff --git a/projects/hip-tests/catch/unit/graph/hipGraphGetNodes.cc b/projects/hip-tests/catch/unit/graph/hipGraphGetNodes.cc
index 959c9c55b6..2d7837fd13 100644
--- a/projects/hip-tests/catch/unit/graph/hipGraphGetNodes.cc
+++ b/projects/hip-tests/catch/unit/graph/hipGraphGetNodes.cc
@@ -22,7 +22,7 @@ THE SOFTWARE.
 #include <hip_test_common.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_kernels.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #include "graph_dependency_common.hh"
 
diff --git a/projects/hip-tests/catch/unit/graph/hipGraphGetRootNodes.cc b/projects/hip-tests/catch/unit/graph/hipGraphGetRootNodes.cc
index 69e4b34de0..7e88953f39 100644
--- a/projects/hip-tests/catch/unit/graph/hipGraphGetRootNodes.cc
+++ b/projects/hip-tests/catch/unit/graph/hipGraphGetRootNodes.cc
@@ -22,7 +22,7 @@ THE SOFTWARE.
 #include <hip_test_common.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_kernels.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #include "graph_dependency_common.hh"
 
diff --git a/projects/hip-tests/catch/unit/graph/hipGraphNodeGetDependencies.cc b/projects/hip-tests/catch/unit/graph/hipGraphNodeGetDependencies.cc
index 82e7ce9aef..a395ebc961 100644
--- a/projects/hip-tests/catch/unit/graph/hipGraphNodeGetDependencies.cc
+++ b/projects/hip-tests/catch/unit/graph/hipGraphNodeGetDependencies.cc
@@ -22,7 +22,7 @@ THE SOFTWARE.
 #include <hip_test_common.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_kernels.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #include "graph_dependency_common.hh"
 
diff --git a/projects/hip-tests/catch/unit/graph/hipGraphNodeGetDependentNodes.cc b/projects/hip-tests/catch/unit/graph/hipGraphNodeGetDependentNodes.cc
index 63d5c4f889..f3a6d984f9 100644
--- a/projects/hip-tests/catch/unit/graph/hipGraphNodeGetDependentNodes.cc
+++ b/projects/hip-tests/catch/unit/graph/hipGraphNodeGetDependentNodes.cc
@@ -22,7 +22,7 @@ THE SOFTWARE.
 #include <hip_test_common.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_kernels.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #include "graph_dependency_common.hh"
 
diff --git a/projects/hip-tests/catch/unit/graph/hipGraphRemoveDependencies.cc b/projects/hip-tests/catch/unit/graph/hipGraphRemoveDependencies.cc
index f29498950b..46d4d6ff10 100644
--- a/projects/hip-tests/catch/unit/graph/hipGraphRemoveDependencies.cc
+++ b/projects/hip-tests/catch/unit/graph/hipGraphRemoveDependencies.cc
@@ -20,7 +20,7 @@ THE SOFTWARE.
 #include <hip_test_common.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_kernels.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #include "graph_dependency_common.hh"
 
diff --git a/projects/hip-tests/catch/unit/graph/hipStreamBeginCapture.cc b/projects/hip-tests/catch/unit/graph/hipStreamBeginCapture.cc
index 21a2edec0b..cbe8185818 100644
--- a/projects/hip-tests/catch/unit/graph/hipStreamBeginCapture.cc
+++ b/projects/hip-tests/catch/unit/graph/hipStreamBeginCapture.cc
@@ -19,7 +19,8 @@ THE SOFTWARE.
 
 #include <hip_test_common.hh>
 #include <hip_test_kernels.hh>
-#include "stream_capture_common.hh"  // NOLINT
+ 
+#include "stream_capture_common.hh" // NOLINT
 
 #pragma clang diagnostic ignored "-Wunused-variable"
 /**
diff --git a/projects/hip-tests/catch/unit/kernel/hipDynamicShared.cc b/projects/hip-tests/catch/unit/kernel/hipDynamicShared.cc
index c8593b0939..90de000d8f 100644
--- a/projects/hip-tests/catch/unit/kernel/hipDynamicShared.cc
+++ b/projects/hip-tests/catch/unit/kernel/hipDynamicShared.cc
@@ -20,7 +20,7 @@ THE SOFTWARE.
 #include <hip_test_kernels.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #pragma clang diagnostic ignored "-Wunused-parameter"
 
diff --git a/projects/hip-tests/catch/unit/kernel/hipDynamicShared2.cc b/projects/hip-tests/catch/unit/kernel/hipDynamicShared2.cc
index 47a94c1357..bcc5ecca85 100644
--- a/projects/hip-tests/catch/unit/kernel/hipDynamicShared2.cc
+++ b/projects/hip-tests/catch/unit/kernel/hipDynamicShared2.cc
@@ -20,7 +20,7 @@ THE SOFTWARE.
 #include <hip_test_kernels.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #define LEN  (16 * 1024)
 #define SIZE (LEN * sizeof(float))
diff --git a/projects/hip-tests/catch/unit/kernel/hipEmptyKernel.cc b/projects/hip-tests/catch/unit/kernel/hipEmptyKernel.cc
index 9262397416..eb6f9818ba 100644
--- a/projects/hip-tests/catch/unit/kernel/hipEmptyKernel.cc
+++ b/projects/hip-tests/catch/unit/kernel/hipEmptyKernel.cc
@@ -20,7 +20,7 @@ THE SOFTWARE.
 #include <hip_test_kernels.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #pragma clang diagnostic ignored "-Wunused-parameter"
 
diff --git a/projects/hip-tests/catch/unit/kernel/hipExtLaunchKernelGGL.cc b/projects/hip-tests/catch/unit/kernel/hipExtLaunchKernelGGL.cc
index c23ebb7f81..6cf89ade50 100644
--- a/projects/hip-tests/catch/unit/kernel/hipExtLaunchKernelGGL.cc
+++ b/projects/hip-tests/catch/unit/kernel/hipExtLaunchKernelGGL.cc
@@ -21,7 +21,7 @@ THE SOFTWARE.
 #include <hip_test_kernels.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 #include "hip/hip_ext.h"
 
 static unsigned threadsPerBlock = 256;
diff --git a/projects/hip-tests/catch/unit/kernel/hipGridLaunch.cc b/projects/hip-tests/catch/unit/kernel/hipGridLaunch.cc
index 7716b0781a..e009a29c77 100644
--- a/projects/hip-tests/catch/unit/kernel/hipGridLaunch.cc
+++ b/projects/hip-tests/catch/unit/kernel/hipGridLaunch.cc
@@ -21,7 +21,7 @@ THE SOFTWARE.
 #include <hip_test_kernels.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 static unsigned threadsPerBlock = 256;
 static unsigned blocksPerCU = 6;
diff --git a/projects/hip-tests/catch/unit/kernel/hipLanguageExtensions.cc b/projects/hip-tests/catch/unit/kernel/hipLanguageExtensions.cc
index 446c91a213..e303c52138 100644
--- a/projects/hip-tests/catch/unit/kernel/hipLanguageExtensions.cc
+++ b/projects/hip-tests/catch/unit/kernel/hipLanguageExtensions.cc
@@ -20,7 +20,7 @@ THE SOFTWARE.
 #include <hip_test_kernels.hh>
 #include <hip_test_common.hh>
 #include <hip_test_checkers.hh>
-#include <hip_test_defgroups.hh>
+ 
 #include <hip/math_functions.h>
 
 #pragma clang diagnostic ignored "-Wunused-variable"
diff --git a/projects/hip-tests/catch/unit/kernel/hipLaunchParm.cc b/projects/hip-tests/catch/unit/kernel/hipLaunchParm.cc
index 9ae028cac7..c5cf63cbbf 100644
--- a/projects/hip-tests/catch/unit/kernel/hipLaunchParm.cc
+++ b/projects/hip-tests/catch/unit/kernel/hipLaunchParm.cc
@@ -20,7 +20,7 @@ THE SOFTWARE.
 #include <hip_test_kernels.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 #include <cstdint>
 
 #pragma clang diagnostic ignored "-Wunused-variable"
diff --git a/projects/hip-tests/catch/unit/kernel/hipLaunchParmFunctor.cc b/projects/hip-tests/catch/unit/kernel/hipLaunchParmFunctor.cc
index 5b12ff52ae..a99aa5f412 100644
--- a/projects/hip-tests/catch/unit/kernel/hipLaunchParmFunctor.cc
+++ b/projects/hip-tests/catch/unit/kernel/hipLaunchParmFunctor.cc
@@ -20,7 +20,7 @@ THE SOFTWARE.
 #include <hip_test_kernels.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 class HipFunctorTests {
  public:
diff --git a/projects/hip-tests/catch/unit/kernel/hipPrintfKernel.cc b/projects/hip-tests/catch/unit/kernel/hipPrintfKernel.cc
index da81c767fa..c616f86eae 100644
--- a/projects/hip-tests/catch/unit/kernel/hipPrintfKernel.cc
+++ b/projects/hip-tests/catch/unit/kernel/hipPrintfKernel.cc
@@ -17,7 +17,7 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 #include <cstring>
 #include "../kernel/printf_common.h"
 
diff --git a/projects/hip-tests/catch/unit/kernel/hipTestConstant.cc b/projects/hip-tests/catch/unit/kernel/hipTestConstant.cc
index 911457af0f..0d7693a91f 100644
--- a/projects/hip-tests/catch/unit/kernel/hipTestConstant.cc
+++ b/projects/hip-tests/catch/unit/kernel/hipTestConstant.cc
@@ -17,7 +17,7 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #define LEN 512
 #define SIZE 2048
diff --git a/projects/hip-tests/catch/unit/kernel/hipTestGlobalVariable.cc b/projects/hip-tests/catch/unit/kernel/hipTestGlobalVariable.cc
index a2d99fa8b7..151a92f7e8 100644
--- a/projects/hip-tests/catch/unit/kernel/hipTestGlobalVariable.cc
+++ b/projects/hip-tests/catch/unit/kernel/hipTestGlobalVariable.cc
@@ -17,7 +17,7 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #define LEN 512
 #define SIZE 2048
diff --git a/projects/hip-tests/catch/unit/kernel/hipTestMemKernel.cc b/projects/hip-tests/catch/unit/kernel/hipTestMemKernel.cc
index d97a5698e0..beedb180a5 100644
--- a/projects/hip-tests/catch/unit/kernel/hipTestMemKernel.cc
+++ b/projects/hip-tests/catch/unit/kernel/hipTestMemKernel.cc
@@ -17,7 +17,7 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #define LEN8 8 * 4
 #define LEN9 9 * 4
diff --git a/projects/hip-tests/catch/unit/kernel/launch_bounds.cc b/projects/hip-tests/catch/unit/kernel/launch_bounds.cc
index 59b1132898..5cab54679b 100644
--- a/projects/hip-tests/catch/unit/kernel/launch_bounds.cc
+++ b/projects/hip-tests/catch/unit/kernel/launch_bounds.cc
@@ -17,7 +17,7 @@ OUT OF OR INN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 constexpr size_t N = 1024;
 int p_blockSize = 256;
diff --git a/projects/hip-tests/catch/unit/memory/hipHostRegister.cc b/projects/hip-tests/catch/unit/memory/hipHostRegister.cc
index cb62532ae7..2110ee9281 100644
--- a/projects/hip-tests/catch/unit/memory/hipHostRegister.cc
+++ b/projects/hip-tests/catch/unit/memory/hipHostRegister.cc
@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include <hip_test_common.hh>
 #include <hip_test_helper.hh>
 #include <hip_test_process.hh>
-#include <hip_test_defgroups.hh>
+ 
 #include <utils.hh>
 
 #define OFFSET 128
diff --git a/projects/hip-tests/catch/unit/memory/hipPointerGetAttributes.cc b/projects/hip-tests/catch/unit/memory/hipPointerGetAttributes.cc
index 4c34a6edc4..60357678f6 100644
--- a/projects/hip-tests/catch/unit/memory/hipPointerGetAttributes.cc
+++ b/projects/hip-tests/catch/unit/memory/hipPointerGetAttributes.cc
@@ -30,7 +30,7 @@ Following scenarios are verified for hipPointerGetAttributes API
 */
 #include <inttypes.h>
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 #ifdef __linux__
 #include <sys/mman.h>
 #endif
diff --git a/projects/hip-tests/catch/unit/module/hipExtModuleLaunchKernel.cc b/projects/hip-tests/catch/unit/module/hipExtModuleLaunchKernel.cc
index 8c77b796d1..3772587453 100644
--- a/projects/hip-tests/catch/unit/module/hipExtModuleLaunchKernel.cc
+++ b/projects/hip-tests/catch/unit/module/hipExtModuleLaunchKernel.cc
@@ -44,7 +44,7 @@ THE SOFTWARE.
  */
 
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 #include <iostream>
 #include <fstream>
 #include "hip/hip_ext.h"
diff --git a/projects/hip-tests/catch/unit/p2p/hipDeviceGetP2PAttribute.cc b/projects/hip-tests/catch/unit/p2p/hipDeviceGetP2PAttribute.cc
index 89207fee7f..5564fdfc31 100644
--- a/projects/hip-tests/catch/unit/p2p/hipDeviceGetP2PAttribute.cc
+++ b/projects/hip-tests/catch/unit/p2p/hipDeviceGetP2PAttribute.cc
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "hip/hip_runtime_api.h"
 #include <hip_test_process.hh>
 #include <string>
-#include <hip_test_defgroups.hh>
+ 
 
 /**
  * @addtogroup hipDeviceGetP2PAttribute hipDeviceGetP2PAttribute
diff --git a/projects/hip-tests/catch/unit/p2p/hipP2pLinkTypeAndHopFunc.cc b/projects/hip-tests/catch/unit/p2p/hipP2pLinkTypeAndHopFunc.cc
index 2aade21ad3..fcd114634f 100644
--- a/projects/hip-tests/catch/unit/p2p/hipP2pLinkTypeAndHopFunc.cc
+++ b/projects/hip-tests/catch/unit/p2p/hipP2pLinkTypeAndHopFunc.cc
@@ -21,7 +21,7 @@ THE SOFTWARE.
 #include <hip_test_kernels.hh>
 #include <hip_test_checkers.hh>
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 #ifdef __linux__
 #include <unistd.h>
 #include <sys/wait.h>
diff --git a/projects/hip-tests/catch/unit/printf/printfFlagsNonHost.cc b/projects/hip-tests/catch/unit/printf/printfFlagsNonHost.cc
index 75f5ef7c35..1fd7900d52 100644
--- a/projects/hip-tests/catch/unit/printf/printfFlagsNonHost.cc
+++ b/projects/hip-tests/catch/unit/printf/printfFlagsNonHost.cc
@@ -18,7 +18,7 @@ THE SOFTWARE.
 
 #include <hip_test_common.hh>
 #include <hip_test_process.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 /**
 * @addtogroup printf printf
diff --git a/projects/hip-tests/catch/unit/printf/printfHost.cc b/projects/hip-tests/catch/unit/printf/printfHost.cc
index 3456d63d21..a4afc5268a 100644
--- a/projects/hip-tests/catch/unit/printf/printfHost.cc
+++ b/projects/hip-tests/catch/unit/printf/printfHost.cc
@@ -19,7 +19,7 @@
    THE SOFTWARE.
  */
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 // Kernel Function
 __global__ void run_printf(int *count) {
diff --git a/projects/hip-tests/catch/unit/printf/printfNonHost.cc b/projects/hip-tests/catch/unit/printf/printfNonHost.cc
index 36bd8e35f6..80989de77a 100644
--- a/projects/hip-tests/catch/unit/printf/printfNonHost.cc
+++ b/projects/hip-tests/catch/unit/printf/printfNonHost.cc
@@ -19,7 +19,7 @@
    THE SOFTWARE.
  */
 #include <hip_test_common.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 #define ITER_COUNT 61681
 #define KERNEL_ITERATIONS 15
diff --git a/projects/hip-tests/catch/unit/printf/printfSpecifiersNonHost.cc b/projects/hip-tests/catch/unit/printf/printfSpecifiersNonHost.cc
index 7c6559641f..c712e5e435 100644
--- a/projects/hip-tests/catch/unit/printf/printfSpecifiersNonHost.cc
+++ b/projects/hip-tests/catch/unit/printf/printfSpecifiersNonHost.cc
@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 #include <hip_test_common.hh>
 #include <hip_test_process.hh>
-#include <hip_test_defgroups.hh>
+ 
 
 /**
 * @addtogroup printf
diff --git a/projects/hip-tests/catch/unit/stream/hipStreamGetDevice.cc b/projects/hip-tests/catch/unit/stream/hipStreamGetDevice.cc
index 1fe87eaeeb..fd89069f2f 100644
--- a/projects/hip-tests/catch/unit/stream/hipStreamGetDevice.cc
+++ b/projects/hip-tests/catch/unit/stream/hipStreamGetDevice.cc
@@ -20,6 +20,7 @@ THE SOFTWARE.
 #include <hip_test_kernels.hh>
 #include <hip_test_common.hh>
 #include <hip_test_checkers.hh>
+
 #define NUMBER_OF_THREADS 10
 static bool thread_results[NUMBER_OF_THREADS];
 
diff --git a/projects/hip-tests/utils/coverage/device_api_list.txt b/projects/hip-tests/utils/coverage/device_api_list.txt
index 7588950886..73adb4a3d2 100644
--- a/projects/hip-tests/utils/coverage/device_api_list.txt
+++ b/projects/hip-tests/utils/coverage/device_api_list.txt
@@ -731,3 +731,9 @@ Device float16 functions [
   __hisnan2
   __hneg2
 ]
+
+OpenGL Interop [
+  hipGLGetDevices
+  hipGraphicsGLRegisterBuffer
+  hipGraphicsGLRegisterImage
+]
\ No newline at end of file
diff --git a/projects/hip-tests/utils/coverage/hipAPICoverageUtils.cpp b/projects/hip-tests/utils/coverage/hipAPICoverageUtils.cpp
index 30242fbcb9..ea55351046 100644
--- a/projects/hip-tests/utils/coverage/hipAPICoverageUtils.cpp
+++ b/projects/hip-tests/utils/coverage/hipAPICoverageUtils.cpp
@@ -47,7 +47,8 @@ void findAPICallInFile(HipAPI& hip_api, std::string test_module_file) {
   std::string api_member{"." + hip_api.getName() + "("};
   std::string api_newline{"  " + hip_api.getName() + "("};
   std::string api_templated{" " + hip_api.getName() + "<"};
-  std::string api_kernel_def_macro{"_KERNEL_DEF(" + hip_api.getName() + ")"};
+  std::string api_kernel_def_macro{"_KERNEL_DEF(" + hip_api.getName()};
+  std::string api_test_def_macro{"_TEST_DEF(" + hip_api.getName()};
 
   std::string api_restriction{hip_api.getFileRestriction()};
   bool found_restriction{false};
@@ -68,7 +69,8 @@ void findAPICallInFile(HipAPI& hip_api, std::string test_module_file) {
         (line.find(api_newline) != std::string::npos) ||
         (line.find(hip_api.getName() + "(") == 0) ||
         (line.find(api_templated) != std::string::npos) ||
-        (line.find(api_kernel_def_macro) != std::string::npos)) {
+        (line.find(api_kernel_def_macro) != std::string::npos) ||
+        (line.find(api_test_def_macro) != std::string::npos)) {
       if (api_restriction == "" || found_restriction) {
         hip_api.addFileOccurrence(FileOccurrence(test_module_file, line_number));
       }
@@ -199,6 +201,7 @@ std::vector<HipAPI> extractHipAPIs(std::string& hip_api_header_file,
   of code shall not be considered.
   */
   std::string hip_api_prefix{"hip"};
+  std::string hip_api_prefix_builtin{"__hip"};
   std::string group_definition{"@defgroup"};
   std::string add_group_definition{"@addtogroup"};
   std::string start_of_api_groups{"HIP API"};
@@ -289,7 +292,11 @@ std::vector<HipAPI> extractHipAPIs(std::string& hip_api_header_file,
       Remove all spaces if they exist in the parsed string, e.g.,
       hipError_t hipDeviceSetLimit ( enum hipLimit_t limit, size_t value );.
       */
-      std::string api_name{api_name_no_brackets.substr(api_name_no_brackets.rfind(hip_api_prefix))};
+      auto api_name_pos = api_name_no_brackets.rfind(hip_api_prefix_builtin);
+      if (api_name_pos == std::string::npos) {
+        api_name_pos = api_name_no_brackets.rfind(hip_api_prefix);
+      }
+      std::string api_name{api_name_no_brackets.substr(api_name_pos)};
       api_name.erase(std::remove(api_name.begin(), api_name.end(), ' '), api_name.end());
 
       if (!api_group_names_tracker.empty()) {
diff --git a/projects/hip-tests/utils/coverage/mainCoverage.cpp b/projects/hip-tests/utils/coverage/mainCoverage.cpp
index cc35cab075..89f7b61652 100644
--- a/projects/hip-tests/utils/coverage/mainCoverage.cpp
+++ b/projects/hip-tests/utils/coverage/mainCoverage.cpp
@@ -47,6 +47,7 @@ int main(int argc, char** argv) {
   std::cout << "Number of detected HIP APIs from " << hip_api_header_file << ": " << hip_apis.size()
             << std::endl;
 
+  api_group_names.push_back("Runtime Compilation");
   std::vector<HipAPI> hip_rtc_apis{extractHipAPIs(hip_rtc_header_file, api_group_names, true)};
   std::cout << "Number of detected HIP APIs from " << hip_rtc_header_file << ": "
             << hip_rtc_apis.size() << std::endl;