diff --git a/fuzz_testing/CMakeLists.txt b/fuzz_testing/CMakeLists.txt
index 73b21137..b536972f 100755
--- a/fuzz_testing/CMakeLists.txt
+++ b/fuzz_testing/CMakeLists.txt
@@ -2,11 +2,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 add_subdirectory(test)
-# add_custom_target(copy_data)
-# add_custom_command(
-#         TARGET copy_data POST_BUILD
-#         COMMAND ${CMAKE_COMMAND} -E copy_directory
-#                 ${CMAKE_CURRENT_SOURCE_DIR}/original_inputs
-#                 ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY original_inputs DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY script DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/fuzz_testing/original_inputs/acl_context_test.yml b/fuzz_testing/original_inputs/acl_context_test.yml
deleted file mode 100644
index 575785a0..00000000
--- a/fuzz_testing/original_inputs/acl_context_test.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-Context:
-  create_context_basic:
-    cl_context_platform: "0x1084"
\ No newline at end of file
diff --git a/fuzz_testing/script/fuzz_test.py b/fuzz_testing/script/fuzz_test.py
index ce671477..e8c81fb1 100644
--- a/fuzz_testing/script/fuzz_test.py
+++ b/fuzz_testing/script/fuzz_test.py
@@ -18,7 +18,6 @@
 
 all_tests = [
             'acl_auto_configure_test',
-            'acl_context_test'
             ]
 
 # First level: unit test file name => table of attributes
diff --git a/fuzz_testing/test/CMakeLists.txt b/fuzz_testing/test/CMakeLists.txt
index d7356e05..9c7ed565 100755
--- a/fuzz_testing/test/CMakeLists.txt
+++ b/fuzz_testing/test/CMakeLists.txt
@@ -7,25 +7,9 @@ target_include_directories(test_acl_fuzz_test_header INTERFACE .)
 add_executable(acl_fuzz_test
   $<TARGET_OBJECTS:acl_objs>
   acl_auto_configure_test.cpp
-  acl_command_queue_test.cpp
-  acl_context_test.cpp
-  acl_device_op_test.cpp
-  acl_device_test.cpp
-  acl_event_test.cpp
   acl_globals_test.cpp
-  acl_hal_mmd_test.cpp
   acl_hal_test.cpp
-  acl_kernel_test.cpp
-  acl_mem_test.cpp
-  acl_platform_test.cpp
-  acl_profiler_test.cpp
-  acl_program_test.cpp
-  acl_sampler_test.cpp
-  acl_support_test.cpp
-  acl_svm_test.cpp
   acl_test.cpp
-  acl_thread_test.cpp
-  acl_usm_test.cpp
   )
 set_target_properties(acl_fuzz_test PROPERTIES CXX_EXTENSIONS OFF)
 target_compile_features(acl_fuzz_test PRIVATE cxx_std_11)
diff --git a/fuzz_testing/test/acl_context_test.cpp b/fuzz_testing/test/acl_context_test.cpp
index 3e74573d..8005ba77 100644
--- a/fuzz_testing/test/acl_context_test.cpp
+++ b/fuzz_testing/test/acl_context_test.cpp
@@ -26,12 +26,9 @@
 
 #include "acl_test.h"
 
-#include "../fuzz_src/fuzz_testing.h"
-
 MT_TEST_GROUP(Context) {
   enum { MAX_DEVICES = 100 };
   virtual void setup() {
-    preload_data("acl_context_test");
     if (threadNum() == 0) {
       ACL_LOCKED(acl_test_setup_generic_system());
     }
@@ -95,18 +92,15 @@ MT_TEST_GROUP(Context) {
   unsigned m_num_automatic;
 };
 
-MT_TEST(Context, create_context_basic) {
+MT_TEST(Context, create_context) {
   cl_int status;
   cl_context valid_context;
   cl_context_properties empty_properties[] = {0};
-  cl_context_properties cl_context_platform =
-      load_fuzzed_value_cast<cl_context_properties>(
-          "Context", "create_context_basic", "cl_context_platform");
   cl_context_properties valid_properties[] = {
-      cl_context_platform, (cl_context_properties)m_platform, 0};
+      CL_CONTEXT_PLATFORM, (cl_context_properties)m_platform, 0};
   cl_context_properties invalid_properties0[] = {
-      cl_context_platform, (cl_context_properties)&status, 0};
-  cl_context_properties invalid_properties1[] = {cl_context_platform +
+      CL_CONTEXT_PLATFORM, (cl_context_properties)&status, 0};
+  cl_context_properties invalid_properties1[] = {CL_CONTEXT_PLATFORM +
                                                      1, // invalid property name
                                                  (cl_context_properties)0, 0};
   cl_device_id bad_device = (cl_device_id)&status; // definitely invalid pointer