diff --git a/build.sh b/build.sh
index 4027609bdd..ba6d5d403c 100755
--- a/build.sh
+++ b/build.sh
@@ -33,7 +33,7 @@ usage() {
   echo -e "-h   | --help               For showing this message"
   echo -e "-b   | --build              For compiling"
   echo -e "-cb  | --clean-build        For full clean build"
-  echo -e "-act | --asan-clean-build   For compiling with ASAN library attached"
+  echo -e "-acb | --asan-clean-build   For compiling with ASAN library attached"
   exit 1
 }
 
diff --git a/tests/featuretests/tracer/apps/goldentraces/hip_helloworld_golden_traces.txt b/tests/featuretests/tracer/apps/goldentraces/hip_helloworld_golden_traces.txt
index 113691f282..c92d6ba2c3 100755
--- a/tests/featuretests/tracer/apps/goldentraces/hip_helloworld_golden_traces.txt
+++ b/tests/featuretests/tracer/apps/goldentraces/hip_helloworld_golden_traces.txt
@@ -2,13 +2,23 @@
 0x2fcc70 agent gpu
 9598333364898937
 Enabling API Tracing
-Record [1], Domain(HIP_API_DOMAIN), Begin(9598333370773048), End(9598333370809238), Correlation ID( 1), ROCTX ID(2), Function(hipGetDeviceProperties)
-Record [3], Domain(HIP_API_DOMAIN), Begin(9598333370859109), End(9598333370912969), Correlation ID( 2), ROCTX ID(0), Function(hipMalloc)
-Record [5], Domain(HIP_API_DOMAIN), Begin(9598333370924259), End(9598333370928959), Correlation ID( 3), ROCTX ID(0), Function(hipMalloc)
-Record [7], Domain(HIP_API_DOMAIN), Begin(9598333370940519), End(9598333575713652), Correlation ID( 4), ROCTX ID(0), Function(hipMemcpy)
-Record [9], Domain(HIP_API_DOMAIN), Begin(9598333575750182), End(9598333575768982), Correlation ID( 5), ROCTX ID(0), Function(__hipPushCallConfiguration)
-Record [11], Domain(HIP_API_DOMAIN), Begin(9598333575779902), End(9598333575783532), Correlation ID( 6), ROCTX ID(0), Function(__hipPopCallConfiguration)
-Record [13], Domain(HIP_API_DOMAIN), Begin(9598333575791112), End(9598333576071305), Correlation ID( 7), ROCTX ID(0), Function(hipLaunchKernel), Kernel Name(helloworld(char*, char*))
-Record [15], Domain(HIP_API_DOMAIN), Begin(9598333576098325), End(9598333576567689), Correlation ID( 8), ROCTX ID(0), Function(hipMemcpy)
-Record [17], Domain(HIP_API_DOMAIN), Begin(9598333576581979), End(9598333576591729), Correlation ID( 9), ROCTX ID(0), Function(hipFree)
-Record [19], Domain(HIP_API_DOMAIN), Begin(9598333576600359), End(9598333576603379), Correlation ID( 10), ROCTX ID(0), Function(hipFree)
+Record(1), Domain(HIP_API_DOMAIN), Function(hipGetDeviceProperties), Begin(2159039058113892), Correlation_ID(1)
+Record(2), Domain(HIP_API_DOMAIN), Function(hipGetDeviceProperties), End(2159039058121252), Correlation_ID(1)
+Record(4), Domain(HIP_API_DOMAIN), Function(hipMalloc), Begin(2159039058128392), Correlation_ID(2)
+Record(5), Domain(HIP_API_DOMAIN), Function(hipMalloc), End(2159039058176762), Correlation_ID(2)
+Record(7), Domain(HIP_API_DOMAIN), Function(hipMalloc), Begin(2159039058180502), Correlation_ID(3)
+Record(8), Domain(HIP_API_DOMAIN), Function(hipMalloc), End(2159039058189602), Correlation_ID(3)
+Record(10), Domain(HIP_API_DOMAIN), Function(hipMemcpy), Begin(2159039058196672), Correlation_ID(4)
+Record(11), Domain(HIP_API_DOMAIN), Function(hipMemcpy), End(2159039277693090), Correlation_ID(4)
+Record(13), Domain(HIP_API_DOMAIN), Function(__hipPushCallConfiguration), Begin(2159039277704830), Correlation_ID(5)
+Record(14), Domain(HIP_API_DOMAIN), Function(__hipPushCallConfiguration), End(2159039277707780), Correlation_ID(5)
+Record(16), Domain(HIP_API_DOMAIN), Function(__hipPopCallConfiguration), Begin(2159039277711180), Correlation_ID(6)
+Record(17), Domain(HIP_API_DOMAIN), Function(__hipPopCallConfiguration), End(2159039277713880), Correlation_ID(6)
+Record(19), Domain(HIP_API_DOMAIN), Function(hipLaunchKernel), Kernel_Name(helloworld(char*, char*)), Begin(2159039277746730), Correlation_ID(7)
+Record(20), Domain(HIP_API_DOMAIN), Function(hipLaunchKernel), Kernel_Name(helloworld(char*, char*)), End(2159039278037481), Correlation_ID(7)
+Record(22), Domain(HIP_API_DOMAIN), Function(hipMemcpy), Begin(2159039278045081), Correlation_ID(8)
+Record(23), Domain(HIP_API_DOMAIN), Function(hipMemcpy), End(2159039278471722), Correlation_ID(8)
+Record(25), Domain(HIP_API_DOMAIN), Function(hipFree), Begin(2159039278478022), Correlation_ID(9)
+Record(26), Domain(HIP_API_DOMAIN), Function(hipFree), End(2159039278489413), Correlation_ID(9)
+Record(28), Domain(HIP_API_DOMAIN), Function(hipFree), Begin(2159039278493343), Correlation_ID(10)
+Record(29), Domain(HIP_API_DOMAIN), Function(hipFree), End(2159039278497233), Correlation_ID(10)