diff --git a/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake b/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake
index fddd4a6d42..aaf099488e 100644
--- a/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake
@@ -5,9 +5,22 @@ function(instrument test)
   # Set Paths Variables
   set(config "${CMAKE_CURRENT_LIST_DIR}/config")
   set(ENV{CMAKE_CONFIG_DIR} ${config})
-  cmake_parse_arguments(ARGS
-    "BUILD;BUILD_MAKE_PROGRAM;INSTALL;TEST;COPY_QUERIES;COPY_QUERIES_GENERATED;NO_WARN;STATIC_QUERY;DYNAMIC_QUERY;INSTALL_PARALLEL;MANUAL_HOOK;PRESERVE_DATA;NO_CONFIGURE"
-    "CHECK_SCRIPT;CONFIGURE_ARG" "" ${ARGN})
+  set(OPTIONS
+    "BUILD"
+    "BUILD_MAKE_PROGRAM"
+    "INSTALL"
+    "INSTALL_PARALLEL"
+    "TEST"
+    "NO_WARN"
+    "COPY_QUERIES"
+    "COPY_QUERIES_GENERATED"
+    "STATIC_QUERY"
+    "DYNAMIC_QUERY"
+    "MANUAL_HOOK"
+    "PRESERVE_DATA"
+    "NO_CONFIGURE"
+  )
+  cmake_parse_arguments(ARGS "${OPTIONS}" "CHECK_SCRIPT;CONFIGURE_ARG" "" ${ARGN})
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test})
   set(uuid "d16a3082-c4e1-489b-b90c-55750a334f27")
   set(v1 ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-${uuid}/v1)
@@ -111,20 +124,28 @@ instrument(hooks-2 BUILD INSTALL TEST)
 instrument(hooks-no-callbacks MANUAL_HOOK)
 
 # Check data file contents for optional query data
-instrument(no-query BUILD INSTALL TEST
-  CHECK_SCRIPT check-data-dir.cmake)
-instrument(dynamic-query BUILD INSTALL TEST DYNAMIC_QUERY
-  CHECK_SCRIPT check-data-dir.cmake)
-instrument(both-query BUILD INSTALL TEST DYNAMIC_QUERY
-  CHECK_SCRIPT check-data-dir.cmake)
+instrument(no-query
+  BUILD INSTALL TEST
+  CHECK_SCRIPT check-data-dir.cmake
+)
+instrument(dynamic-query
+  BUILD INSTALL TEST DYNAMIC_QUERY
+  CHECK_SCRIPT check-data-dir.cmake
+)
+instrument(both-query
+  BUILD INSTALL TEST DYNAMIC_QUERY
+  CHECK_SCRIPT check-data-dir.cmake
+)
 
 # Test cmake_instrumentation command
 instrument(cmake-command
-  COPY_QUERIES NO_WARN DYNAMIC_QUERY
-  CHECK_SCRIPT check-generated-queries.cmake)
+  COPY_QUERIES NO_WARN STATIC_QUERY DYNAMIC_QUERY
+  CHECK_SCRIPT check-generated-queries.cmake
+)
 instrument(cmake-command-data
   COPY_QUERIES NO_WARN BUILD INSTALL TEST DYNAMIC_QUERY
-  CHECK_SCRIPT check-data-dir.cmake)
+  CHECK_SCRIPT check-data-dir.cmake
+)
 instrument(cmake-command-bad-api-version NO_WARN)
 instrument(cmake-command-bad-data-version NO_WARN)
 instrument(cmake-command-missing-version NO_WARN)
@@ -132,30 +153,29 @@ instrument(cmake-command-bad-arg NO_WARN)
 instrument(cmake-command-parallel-install
   BUILD INSTALL TEST NO_WARN INSTALL_PARALLEL DYNAMIC_QUERY
   CHECK_SCRIPT check-data-dir.cmake)
-instrument(cmake-command-resets-generated NO_WARN
-  COPY_QUERIES_GENERATED
+instrument(cmake-command-resets-generated
+  NO_WARN COPY_QUERIES_GENERATED
   CHECK_SCRIPT check-data-dir.cmake
 )
-instrument(cmake-command-cmake-build NO_WARN
-  BUILD
+instrument(cmake-command-cmake-build
+  NO_WARN BUILD
   CHECK_SCRIPT check-no-make-program-hooks.cmake
 )
 
 # Test CUSTOM_CONTENT
-instrument(cmake-command-custom-content NO_WARN BUILD
+instrument(cmake-command-custom-content
+  NO_WARN BUILD
   CONFIGURE_ARG "-DN=1"
 )
-instrument(cmake-command-custom-content NO_WARN BUILD
+instrument(cmake-command-custom-content
+  NO_WARN BUILD PRESERVE_DATA
   CONFIGURE_ARG "-DN=2"
   CHECK_SCRIPT check-custom-content.cmake
-  PRESERVE_DATA
 )
-instrument(cmake-command-custom-content NO_WARN NO_CONFIGURE
-  MANUAL_HOOK
-  PRESERVE_DATA
+instrument(cmake-command-custom-content
+  NO_WARN NO_CONFIGURE MANUAL_HOOK PRESERVE_DATA
   CHECK_SCRIPT check-custom-content-removed.cmake
 )
-
 instrument(cmake-command-custom-content-bad-type NO_WARN)
 instrument(cmake-command-custom-content-bad-content NO_WARN)
 
@@ -181,7 +201,7 @@ elseif(RunCMake_GENERATOR STREQUAL "NMake Makefiles")
    endif()
 endif()
 if(NOT Skip_BUILD_MAKE_PROGRAM_Case)
-  instrument(cmake-command-make-program NO_WARN
-    BUILD_MAKE_PROGRAM
+  instrument(cmake-command-make-program
+    NO_WARN BUILD_MAKE_PROGRAM
     CHECK_SCRIPT check-make-program-hooks.cmake)
 endif()
diff --git a/Tests/RunCMake/Instrumentation/hook.cmake b/Tests/RunCMake/Instrumentation/hook.cmake
index 68f8c66360..dd194affba 100644
--- a/Tests/RunCMake/Instrumentation/hook.cmake
+++ b/Tests/RunCMake/Instrumentation/hook.cmake
@@ -26,7 +26,7 @@ json_has_key("${index}" "${contents}" dataDir)
 json_has_key("${index}" "${contents}" snippets)
 
 if (NOT version EQUAL 1)
-    add_error("Version must be 1, got: ${version}")
+  add_error("Version must be 1, got: ${version}")
 endif()
 
 string(JSON length LENGTH "${snippets}")