diff --git a/shared/source/built_ins/kernels/copy_kernel_timestamps.builtin_kernel b/shared/source/built_ins/kernels/copy_kernel_timestamps.builtin_kernel
index b4e13a564e..923f03cc21 100644
--- a/shared/source/built_ins/kernels/copy_kernel_timestamps.builtin_kernel
+++ b/shared/source/built_ins/kernels/copy_kernel_timestamps.builtin_kernel
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -50,9 +50,8 @@ __kernel void QueryKernelTimestamps(__global ulong* srcEvents, __global ulong* d
     ulong globalEnd = GetTimestampValue(srcPtr, timestampSizeInDw, 3);
 
     if(packetUsed > 1) {
-        uint timestampsOffsets = 4;
         for(uint i = 1; i < packetUsed; i++) {
-            timestampsOffsets += i;
+            uint timestampsOffsets = 4 * i;
             if(contextStart > GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets)) {
               contextStart = GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets);
             }
@@ -91,9 +90,8 @@ __kernel void QueryKernelTimestampsWithOffsets(__global ulong* srcEvents, __glob
     ulong globalEnd = GetTimestampValue(srcPtr, timestampSizeInDw, 3);
 
     if(packetUsed > 1) {
-        uint timestampsOffsets = 4;
         for(uint i = 1; i < packetUsed; i++) {
-            timestampsOffsets += i;
+            uint timestampsOffsets = 4 * i;
             if(contextStart > GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets)) {
               contextStart = GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets);
             }
diff --git a/shared/test/common/helpers/kernel_binary_helper_hash_value.cpp b/shared/test/common/helpers/kernel_binary_helper_hash_value.cpp
index a3a1571c20..8a5f3971fe 100644
--- a/shared/test/common/helpers/kernel_binary_helper_hash_value.cpp
+++ b/shared/test/common/helpers/kernel_binary_helper_hash_value.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,5 +7,5 @@
 
 #include "shared/test/common/helpers/kernel_binary_helper.h"
 
-const std::string KernelBinaryHelper::BUILT_INS("7836643072362489210");
-const std::string KernelBinaryHelper::BUILT_INS_WITH_IMAGES("10613492505254921609_images");
+const std::string KernelBinaryHelper::BUILT_INS("7998916142903730155");
+const std::string KernelBinaryHelper::BUILT_INS_WITH_IMAGES("16526264370178379440_images");
diff --git a/shared/test/common/test_files/10613492505254921609_images.cl b/shared/test/common/test_files/16526264370178379440_images.cl
similarity index 99%
rename from shared/test/common/test_files/10613492505254921609_images.cl
rename to shared/test/common/test_files/16526264370178379440_images.cl
index 281e94c073..ae42cba09f 100644
--- a/shared/test/common/test_files/10613492505254921609_images.cl
+++ b/shared/test/common/test_files/16526264370178379440_images.cl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -263,9 +263,8 @@ __kernel void QueryKernelTimestamps(__global ulong* srcEvents, __global ulong* d
     ulong globalEnd = GetTimestampValue(srcPtr, timestampSizeInDw, 3);
 
     if(packetUsed > 1) {
-        uint timestampsOffsets = 4;
         for(uint i = 1; i < packetUsed; i++) {
-            timestampsOffsets += i;
+            uint timestampsOffsets = 4 * i;
             if(contextStart > GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets)) {
               contextStart = GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets);
             }
@@ -304,9 +303,8 @@ __kernel void QueryKernelTimestampsWithOffsets(__global ulong* srcEvents, __glob
     ulong globalEnd = GetTimestampValue(srcPtr, timestampSizeInDw, 3);
 
     if(packetUsed > 1) {
-        uint timestampsOffsets = 4;
         for(uint i = 1; i < packetUsed; i++) {
-            timestampsOffsets += i;
+            uint timestampsOffsets = 4 * i;
             if(contextStart > GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets)) {
               contextStart = GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets);
             }
diff --git a/shared/test/common/test_files/10613492505254921609_images_options.txt b/shared/test/common/test_files/16526264370178379440_images_options.txt
similarity index 60%
rename from shared/test/common/test_files/10613492505254921609_images_options.txt
rename to shared/test/common/test_files/16526264370178379440_images_options.txt
index 4b4fb9ef0a..083f6ac3ba 100644
--- a/shared/test/common/test_files/10613492505254921609_images_options.txt
+++ b/shared/test/common/test_files/16526264370178379440_images_options.txt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/shared/test/common/test_files/7836643072362489210.cl b/shared/test/common/test_files/7998916142903730155.cl
similarity index 98%
rename from shared/test/common/test_files/7836643072362489210.cl
rename to shared/test/common/test_files/7998916142903730155.cl
index 84b84c29c7..88541d4f1f 100644
--- a/shared/test/common/test_files/7836643072362489210.cl
+++ b/shared/test/common/test_files/7998916142903730155.cl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -263,9 +263,8 @@ __kernel void QueryKernelTimestamps(__global ulong* srcEvents, __global ulong* d
     ulong globalEnd = GetTimestampValue(srcPtr, timestampSizeInDw, 3);
 
     if(packetUsed > 1) {
-        uint timestampsOffsets = 4;
         for(uint i = 1; i < packetUsed; i++) {
-            timestampsOffsets += i;
+            uint timestampsOffsets = 4 * i;
             if(contextStart > GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets)) {
               contextStart = GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets);
             }
@@ -304,9 +303,8 @@ __kernel void QueryKernelTimestampsWithOffsets(__global ulong* srcEvents, __glob
     ulong globalEnd = GetTimestampValue(srcPtr, timestampSizeInDw, 3);
 
     if(packetUsed > 1) {
-        uint timestampsOffsets = 4;
         for(uint i = 1; i < packetUsed; i++) {
-            timestampsOffsets += i;
+            uint timestampsOffsets = 4 * i;
             if(contextStart > GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets)) {
               contextStart = GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets);
             }
diff --git a/shared/test/common/test_files/7836643072362489210_options.txt b/shared/test/common/test_files/7998916142903730155_options.txt
similarity index 60%
rename from shared/test/common/test_files/7836643072362489210_options.txt
rename to shared/test/common/test_files/7998916142903730155_options.txt
index 4b4fb9ef0a..083f6ac3ba 100644
--- a/shared/test/common/test_files/7836643072362489210_options.txt
+++ b/shared/test/common/test_files/7998916142903730155_options.txt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/shared/test/common/test_files/builtin_copyfill.cl b/shared/test/common/test_files/builtin_copyfill.cl
index a65e7f8874..88541d4f1f 100644
--- a/shared/test/common/test_files/builtin_copyfill.cl
+++ b/shared/test/common/test_files/builtin_copyfill.cl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -263,9 +263,8 @@ __kernel void QueryKernelTimestamps(__global ulong* srcEvents, __global ulong* d
     ulong globalEnd = GetTimestampValue(srcPtr, timestampSizeInDw, 3);
 
     if(packetUsed > 1) {
-        uint timestampsOffsets = 4;
         for(uint i = 1; i < packetUsed; i++) {
-            timestampsOffsets *= i;
+            uint timestampsOffsets = 4 * i;
             if(contextStart > GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets)) {
               contextStart = GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets);
             }
@@ -304,9 +303,8 @@ __kernel void QueryKernelTimestampsWithOffsets(__global ulong* srcEvents, __glob
     ulong globalEnd = GetTimestampValue(srcPtr, timestampSizeInDw, 3);
 
     if(packetUsed > 1) {
-        uint timestampsOffsets = 4;
         for(uint i = 1; i < packetUsed; i++) {
-            timestampsOffsets *= i;
+            uint timestampsOffsets = 4 * i;
             if(contextStart > GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets)) {
               contextStart = GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets);
             }
diff --git a/shared/test/common/test_files/builtin_copyfill_stateless.cl b/shared/test/common/test_files/builtin_copyfill_stateless.cl
index 034fe1f95c..ab34f32b30 100644
--- a/shared/test/common/test_files/builtin_copyfill_stateless.cl
+++ b/shared/test/common/test_files/builtin_copyfill_stateless.cl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -238,9 +238,8 @@ __kernel void QueryKernelTimestamps(__global ulong* srcEvents, __global ulong* d
     uint globalEnd = src[3];
 
     if(packetUsed > 1) {
-      uint timestampsOffsets = 4;
         for(uint i = 1; i < packetUsed; i++) {
-            timestampsOffsets *= i;
+            uint timestampsOffsets = 4 * i;
             if(contextStart > src[timestampsOffsets]) {
               contextStart = src[timestampsOffsets];
             }
@@ -287,9 +286,8 @@ __kernel void QueryKernelTimestampsWithOffsets(__global ulong* srcEvents, __glob
     uint globalEnd = src[3];
 
     if(packetUsed > 1) {
-      uint timestampsOffsets = 4;
         for(uint i = 1; i < packetUsed; i++) {
-            timestampsOffsets *= i;
+            uint timestampsOffsets = 4 * i;
             if(contextStart > src[timestampsOffsets]) {
               contextStart = src[timestampsOffsets];
             }
diff --git a/shared/test/common/test_files/builtin_images.cl b/shared/test/common/test_files/builtin_images.cl
index 1a59856ede..ca761fa941 100644
--- a/shared/test/common/test_files/builtin_images.cl
+++ b/shared/test/common/test_files/builtin_images.cl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -263,9 +263,8 @@ __kernel void QueryKernelTimestamps(__global ulong* srcEvents, __global ulong* d
     ulong globalEnd = GetTimestampValue(srcPtr, timestampSizeInDw, 3);
 
     if(packetUsed > 1) {
-        uint timestampsOffsets = 4;
         for(uint i = 1; i < packetUsed; i++) {
-            timestampsOffsets *= i;
+            uint timestampsOffsets = 4 * i;
             if(contextStart > GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets)) {
               contextStart = GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets);
             }
@@ -304,9 +303,8 @@ __kernel void QueryKernelTimestampsWithOffsets(__global ulong* srcEvents, __glob
     ulong globalEnd = GetTimestampValue(srcPtr, timestampSizeInDw, 3);
 
     if(packetUsed > 1) {
-        uint timestampsOffsets = 4;
         for(uint i = 1; i < packetUsed; i++) {
-            timestampsOffsets *= i;
+            uint timestampsOffsets = 4 * i;
             if(contextStart > GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets)) {
               contextStart = GetTimestampValue(srcPtr, timestampSizeInDw, timestampsOffsets);
             }