diff --git a/jobs/phoronix-test-suite-avx-part1.yaml b/jobs/phoronix-test-suite-avx-part1.yaml
index 20d108e47..11219772c 100644
--- a/jobs/phoronix-test-suite-avx-part1.yaml
+++ b/jobs/phoronix-test-suite-avx-part1.yaml
@@ -10,11 +10,9 @@ phoronix-test-suite:
   #    - Add
   #    - Triad
   #    - Average
-  #    # - Test All Options
   #  option_b:
   #    - Integer
   #    - Floating Point
-  #    # - Test All Options
   - test:
     - rust-mandel-1.0.0
   - test: stream-1.3.4
@@ -23,14 +21,12 @@ phoronix-test-suite:
       - Scale
       - Add
       - Triad
-      # - Test All Options
 
   - test: svt-vp9-1.3.0
     option_a:
       - Visual Quality Optimized
       - PSNR/SSIM Optimized      [Default]
       - VMAF Optimized
-      # - Test All Options
   - test: onednn-3.3.0
     option_a:
       # - Convolution Batch Shapes Auto # The test quit with a non-zero exit status.
@@ -40,7 +36,6 @@ phoronix-test-suite:
       # - IP Shapes 3D # The test quit with a non-zero exit status.
       - Recurrent Neural Network Training
       # - Recurrent Neural Network Inference # The test quit with a non-zero exit status.
-      # - Test All Options
     option_b:
       - 1 # f32
       - 2 # u8s8f32      [Optimized For AVX-512]
diff --git a/jobs/phoronix-test-suite-avx-part2.yaml b/jobs/phoronix-test-suite-avx-part2.yaml
index a6b65612b..d4795bf22 100644
--- a/jobs/phoronix-test-suite-avx-part2.yaml
+++ b/jobs/phoronix-test-suite-avx-part2.yaml
@@ -15,4 +15,3 @@ phoronix-test-suite:
     option_b:
       - Bosphorus 1080p
       - Bosphorus 4K
-      # - Test All Options
diff --git a/jobs/phoronix-test-suite-blender-opencl.yaml b/jobs/phoronix-test-suite-blender-opencl.yaml
index 222e8c345..bb102bb7f 100644
--- a/jobs/phoronix-test-suite-blender-opencl.yaml
+++ b/jobs/phoronix-test-suite-blender-opencl.yaml
@@ -13,10 +13,8 @@ phoronix-test-suite:
       # - Fishy Cat # elapsed_time: 2935s
       # - Pabellon Barcelona # elapsed_time: 3164s
       # - Barbershop # The test quit with a non-zero exit status.
-      # - Test All Options
     option_b:
       - CPU-Only
       - Intel oneAPI
-      # - Test All Options
 
 timeout: 1h
diff --git a/jobs/phoronix-test-suite-needx-opencl.yaml b/jobs/phoronix-test-suite-needx-opencl.yaml
index 6c2e3c0a5..5cff2b5eb 100644
--- a/jobs/phoronix-test-suite-needx-opencl.yaml
+++ b/jobs/phoronix-test-suite-needx-opencl.yaml
@@ -10,12 +10,10 @@ phoronix-test-suite:
       # - Read
       # - Write
       # - Copy
-      # - Test All Options
   # - test: financebench-1.1.1 # The test quit with a non-zero exit status.
   #   option_a:
   #     - Bonds OpenMP
       # - Repo OpenMP
-      # - Test All Options
 
     # - gl-vs-vk-1.0.0 # required lib libGLEW.so.1.13 is too old
   # - test: juliagpu-1.3.1 # "OpenCL unavailable" issue unable to fix yet
@@ -23,26 +21,22 @@ phoronix-test-suite:
       # - CPU
       # - GPU
       # - CPU+GPU
-      # - Test All Options
   # - test: luxmark-1.2.1 # "OpenCL unavailable" issue unable to fix yet
   # - test: mandelbulbgpu-1.3.0 # "OpenCL unavailable" issue unable to fix yet
     # option_a:
       # - CPU
       # - GPU
       # - CPU+GPU
-      # - Test All Options
   # - test: mandelgpu-1.3.1 # "OpenCL unavailable" issue unable to fix yet
     # option_a:
       # - CPU
       # - GPU
       # - CPU+GPU
-      # - Test All Options
   - test: mixbench-1.0.0
     option_a:
       # - Single Precision # The test quit with a non-zero exit status.
       - Double Precision
       # - Integer # The test quit with a non-zero exit status.
-      # - Test All Options
 
   # - test: shoc-1.2.0 # No supported options found for target. "OpenCL unavailable" issue unable to fix yet
   #   option_a:
@@ -53,15 +47,12 @@ phoronix-test-suite:
   #     - FFT SP
   #     - MD5 Hash
   #     - Triad
-  #     # - Test All Options
 
   # - test: smallpt-gpu-1.3.0 # "OpenCL unavailable" issue unable to fix yet
     # option_a:
       # - CPU
       # - GPU
-      # - Test All Options
     # option_b:
       # - Complex
       # - Caustic3
       # - Cornell
-      # - Test All Options
diff --git a/jobs/phoronix-test-suite-needx-opengl.yaml b/jobs/phoronix-test-suite-needx-opengl.yaml
index e97a73a23..d5133c836 100644
--- a/jobs/phoronix-test-suite-needx-opengl.yaml
+++ b/jobs/phoronix-test-suite-needx-opengl.yaml
@@ -10,8 +10,6 @@ phoronix-test-suite:
     option_a:
       # - 800 x 600
       - 1024 x 768
-      # - Test All Options
     option_b:
       - Fullscreen
       # - Windowed
-      # - Test All Options
diff --git a/jobs/phoronix-test-suite-needx-part1.yaml b/jobs/phoronix-test-suite-needx-part1.yaml
index 4f4ddd901..41c0f3262 100644
--- a/jobs/phoronix-test-suite-needx-part1.yaml
+++ b/jobs/phoronix-test-suite-needx-part1.yaml
@@ -52,13 +52,11 @@ phoronix-test-suite:
       - TexturedQuadsProblem GLNoTexUniform
       # - TexturedQuadsProblem GLSBTA # The test run did not produce a result.
       - TexturedQuadsProblem GLTextureArray
-      # - Test All Options
   - test: cairo-perf-trace-1.0.2
     option_a:
       # - Firefox Canvas # out of memory
       # - GNOME Terminal Vim # out of memory
       - Poppler
-      # - Test All Options
     # - cuda-mini-nbody-1.1.1 # need CUDA compatible hardware
   - test: et-1.1.0
     option_a:
@@ -67,7 +65,6 @@ phoronix-test-suite:
     # option_a:
       # - Default
       # - Renderer2
-      # - Test All Options
     # option_b:
       # - 1024 x 768
     # - etxreal-1.0.0 # too old (last update 2012) to work
@@ -85,7 +82,6 @@ phoronix-test-suite:
       - GL2 Hot Tunnel DNA
       - GL3 Mesh Exploder
       - GL3 Vertex Pool
-      # - Test All Options
     # - gfxbench-1.0.0 # need to download files from stream
   - test: glmark2-1.4.0
     option_a:
@@ -94,11 +90,9 @@ phoronix-test-suite:
     option_a:
       - Fullscreen
       # - Windowed
-      # - Test All Options
     option_b:
       # - 800 x 600
       - 1024 x 768
-      # - Test All Options
     option_c:
       - Fill-Rate
       - Fragment
@@ -106,7 +100,6 @@ phoronix-test-suite:
       - Vertex
       - Complex
       # - Compute # The test run did not produce a result.
-      # - Test All Options
   - test: gputest-1.3.2
     option_a:
       - Furmark
@@ -116,13 +109,11 @@ phoronix-test-suite:
       - Pixmark Volplosion
       - Triangle
       - Plot3D
-      # - Test All Options
     option_b:
       - 1024 x 768
     option_c:
       - Fullscreen
       # - Windowed
-      # - Test All Options
   - test: gtkperf-1.2.2
     option_a:
       - GtkComboBox
@@ -135,12 +126,10 @@ phoronix-test-suite:
       - GtkDrawingArea - Circles
       - GtkDrawingArea - Pixbufs
       - Total Time
-      # - Test All Options
   - test: indigobench-1.1.0
     option_a:
       - Supercar
       - Bedroom
-      # - Test All Options
 
   # - test: j2dbench-1.1.2 # The test run did not produce a result.
   #   option_a:
@@ -148,7 +137,6 @@ phoronix-test-suite:
   #     - Vector Graphics Rendering
   #     - Image Rendering
   #     - Text Rendering
-  #     # - Test All Options
 
     # - jgfxbat-1.1.0 # 3rd party url is N/A
     # - octanebench-1.1.2 # need CUDA compatible hardware
@@ -158,13 +146,11 @@ phoronix-test-suite:
       - 1024 x 768
       # - 1920 x 1080
       # - 2560 x 1440
-      # - Test All Options
   - test: paraview-1.3.0
     option_a:
       - Many Spheres
       - Wavelet Contour
       - Wavelet Volume
-      # - Test All Options
     option_b:
       - 1024 x 768
     # - prey-1.1.2 # need to download files from stream
@@ -173,17 +159,14 @@ phoronix-test-suite:
       - CPU-based Raster
       - XRender Extension
       - OpenGL
-      # - Test All Options
     option_b:
       - Gears
       - Text
       - Image Scaling
-      # - Test All Options
   - test: qmlbench-1.1.0
     option_a:
       # - 800 x 600
       - 1024 x 768
-      # - Test All Options
     option_b:
       - Moving Images Animations
       - Canvas Text Simple
@@ -192,7 +175,6 @@ phoronix-test-suite:
       - Fib10
       - Delegates Canvas FBO Threaded
       # - Delegates Canvas FBO Threaded # duplicate
-      # - Test All Options
   - test:
     # - quake4-1.1.0 # need extra quake4 gamefile and key
     # - render-bench-1.1.2 # need imlib2-config which is only available in outdated version of libimlib2-dev
@@ -202,20 +184,17 @@ phoronix-test-suite:
     # option_a:
       # - Firefox
       # - Google Chrome
-      # - Test All Options
   - test: supertuxkart-1.6.0
     option_a:
       - 1024 x 768
     option_b:
       # - Windowed
       - Fullscreen
-      # - Test All Options
     option_c:
       - Low
       - Medium
       - High
       - Ultimate
-      # - Test All Options
     option_d: # number of karts
       - 1
       # - 2
@@ -225,7 +204,6 @@ phoronix-test-suite:
       # - 6
       # - 7
       # - 8
-      # - Test All Options
     option_e:
       - 1 # Candela City          [Approximately 400k triangles; advanced graphics]
       - 2 # Cocoa Temple          [Approximately 300k triangles; advanced graphics]
@@ -246,7 +224,6 @@ phoronix-test-suite:
     option_b:
       - Fullscreen
       # - Windowed
-      # - Test All Options
 
   - test: unigine-tropics-1.6.4
     option_a:
@@ -254,7 +231,6 @@ phoronix-test-suite:
     option_b:
       - Fullscreen
       # - Windowed
-      # - Test All Options
   - test: urbanterror-1.3.0
     # - unvanquished-1.8.0 # this test profile is currently marked Broken
     option_a:
@@ -274,6 +250,5 @@ phoronix-test-suite:
       - Copy 500x500 From Pixmap To Pixmap
       - PutImage XY 500x500 Square
       - Char in 80-char aa line
-      # - Test All Options
     # - xonotic-1.7.0 # runtime is long
     # - xplane9-1.3.1 # need 32bit libs (libjpeg62:i386 etc)
diff --git a/jobs/phoronix-test-suite-needx-part2.yaml b/jobs/phoronix-test-suite-needx-part2.yaml
index da1a994f2..c10208a46 100644
--- a/jobs/phoronix-test-suite-needx-part2.yaml
+++ b/jobs/phoronix-test-suite-needx-part2.yaml
@@ -23,14 +23,12 @@ phoronix-test-suite:
       - Gradient+Temp Texture
       - 12pt Text Grayscale
       - 12pt Text LCD
-      # - Test All Options
     option_b:
       - 32x32
       # - 128x128
       # - 256x256
       # - 512x512
       - 1024x1024
-      # - Test All Options
 
   - test: unigine-sanctuary-1.6.4
     option_a:
@@ -38,4 +36,3 @@ phoronix-test-suite:
     option_b:
       - Fullscreen
       # - Windowed
-      # - Test All Options
diff --git a/jobs/phoronix-test-suite-opencl.yaml b/jobs/phoronix-test-suite-opencl.yaml
index c7678ad76..cd610dbdf 100644
--- a/jobs/phoronix-test-suite-opencl.yaml
+++ b/jobs/phoronix-test-suite-opencl.yaml
@@ -8,14 +8,12 @@ phoronix-test-suite:
       - BLAS CPU FP32
       - BLAS CPU FP16
       # - Conjugate Gradient CPU # The test run did not produce a result.
-      # - Test All Options
   - test: askap-2.1.0
     option_a:
       - tConvolve MPI
       - tConvolve OpenMP
       - tConvolve MT
       - Hogbom Clean OpenMP
-      # - Test All Options
   # - test: clpeak-1.1.0 # "OpenCL unavailable" issue unable to fix yet
     # option_a:
       # - Global Memory Bandwidth
@@ -26,7 +24,6 @@ phoronix-test-suite:
       # - Transfer Bandwidth enqueueWriteBuffer
       # - Transfer Bandwidth enqueueReadBuffer
       # - Kernel Latency
-      # - Test All Options
 
   # - test: darktable-1.0.5 # is not installed
   #   option_a:
@@ -34,11 +31,9 @@ phoronix-test-suite:
   #     - Masskrug
   #     - Server Room
   #     - Server Rack
-  #     # - Test All Options
   #   option_b:
   #     - CPU-only
   #     - OpenCL
-  #     # - Test All Options
 
   - test: parboil-1.2.1
     option_a:
@@ -47,7 +42,6 @@ phoronix-test-suite:
       # - OpenMP MRI Gridding # The test quit with a non-zero exit status.
       - OpenMP Stencil
       # - OpenMP LBM # The test quit with a non-zero exit status.
-      # - Test All Options
     times_to_run: 1
 
   - test: rodinia-1.3.2
@@ -66,7 +60,6 @@ phoronix-test-suite:
       # - GPU Apple Metal
       # - GPU NVIDIA CUDA # not supported and not display
       # - GPU Vulkan
-      # - Test All Options
   - test:
     - xsbench-cl-1.0.0
     # - x264-opencl-1.9.1 # this benchmark has build errors
diff --git a/jobs/phoronix-test-suite-part1.yaml b/jobs/phoronix-test-suite-part1.yaml
index 6cc31b680..67bd505db 100644
--- a/jobs/phoronix-test-suite-part1.yaml
+++ b/jobs/phoronix-test-suite-part1.yaml
@@ -26,13 +26,11 @@ phoronix-test-suite:
       # - 200
       # - 250
       # - 500
-      # - Test All Options
   - test: appleseed-1.0.1
     option_a:
       - Emily
       - Disney Material
       - Material Tester
-      # - Test All Options
   - test:
     - blake2-1.2.2
 
@@ -47,7 +45,6 @@ phoronix-test-suite:
       - KASUMI
       - Twofish
       - ChaCha20Poly1305
-      # - Test All Options
   - test:
     - build-apache-1.6.1
     # - build-clash-1.0.2 # wait for newer version
@@ -68,7 +65,6 @@ phoronix-test-suite:
     option_a:
       - Default
       - Released Build, PGO + LTO Optimized
-      # - Test All Options
   - test: bullet-1.2.2
     option_a:
       - 3000 Fall
@@ -78,7 +74,6 @@ phoronix-test-suite:
       - Prim Trimesh
       - Convex Trimesh
       - Raytests
-      # - Test All Options
   - test:
     - byte-1.2.2
     - c-ray-1.2.0
@@ -87,7 +82,6 @@ phoronix-test-suite:
       - Read
       - Write
       - Read / Modify / Write
-      # - Test All Options
     # - caffe-1.3.3 # wait for newer version
 
   # - test: cassandra-1.2.0 # The test run did not produce a result.
@@ -95,7 +89,6 @@ phoronix-test-suite:
   #     - Writes
   #     - Mixed 1:1
   #     - Mixed 1:3
-  #     # - Test All Options
 
   - test:
     # - civilization-vi-1.0.1 # install failed
@@ -108,7 +101,6 @@ phoronix-test-suite:
       - Initial Create
       - Compile
       - Read Compiled Tree
-      # - Test All Options
   - test:
     - compress-7zip-1.10.0
     - compress-gzip-1.2.0
@@ -117,7 +109,6 @@ phoronix-test-suite:
       - 1
       - 3
       - 9
-      # - Test All Options
   - test:
     # - compress-lzma-1.3.1 # not an available test
     # - compress-pbzip2-1.5.0 # install failed
@@ -137,7 +128,6 @@ phoronix-test-suite:
       - Ctype
       - Math Library
       # - Random Numbers # runtime > 30m
-      # - Test All Options
   - test:
     - crafty-1.4.5
     # - csgo-1.7.2 # install failed
@@ -168,14 +158,12 @@ phoronix-test-suite:
       - Apache Kafka
       - Spring Boot
       - Zxing 1D/2D Barcode Image Processing
-      # - Test All Options
   - test: dav1d-1.14.0
     option_a:
       - Summer Nature 1080p
       - Summer Nature 4K
       - Chimera 1080p
       - Chimera 1080p 10-bit
-      # - Test All Options
   # - test: dbench-1.0.2
     # option_a: # client count
       # - 1
@@ -184,7 +172,6 @@ phoronix-test-suite:
       # - 48
       # - 128
       # - 256
-      # - Test All Options
   - test:
     # - dcraw-1.1.0 not an available test
     - deeprec-1.0.2
@@ -203,12 +190,10 @@ phoronix-test-suite:
     option_a:
       - Pathtracer
       - Pathtracer ISPC
-      # - Test All Options
     option_b:
       - Asian Dragon
       - Asian Dragon Obj
       - Crown
-      # - Test All Options
     # - encode-ape-1.3.0 # this test profile is marked Deprecated
   - test:
     - encode-flac-1.8.1
@@ -222,11 +207,9 @@ phoronix-test-suite:
     option_a:
       - Single-Threaded
       - Multi-Threaded
-      # - Test All Options
     option_b:
       - ETC2
       - DXT1
-      # - Test All Options
   - test:
     # - f12017-1.1.1 # install failed
     # - fahbench-1.0.2 # The test run did not produce a result.
@@ -236,19 +219,16 @@ phoronix-test-suite:
     option_a:
       - libx264
       - libx265
-      # - Test All Options
     option_b:
       - Live
       - Upload
       - Platform
       - Video On Demand
       # - Upload # this is duplicate to the second
-      # - Test All Options
   - test: fftw-1.2.0
     option_a:
       - Stock
       - Float + SSE
-      # - Test All Options
     option_b:
       # - 1D FFT Size 32
       # - 1D FFT Size 64
@@ -266,7 +246,6 @@ phoronix-test-suite:
       # - 2D FFT Size 1024
       # - 2D FFT Size 2048
       # - 2D FFT Size 4096
-      # - Test All Options
   - test:
     - fhourstones-1.1.2
   # - test: fio-2.1.0 # temporarily comment out
@@ -275,21 +254,17 @@ phoronix-test-suite:
       # - Random Write
       # - Sequential Read
       # - Sequential Write
-      # - Test All Options
     # option_b:
       # - IO_uring
       # - POSIX AIO
       # - Sync
       # - Linux AIO
-      # - Test All Options
     # option_c:
       # - 'Yes'
       # - 'No'
-      # - Test All Options
     # option_d:
       # - 'No'
       # - 'Yes'
-      # - Test All Options
     # option_e:
       # - 4KB
       # - 8KB
@@ -303,11 +278,9 @@ phoronix-test-suite:
       # - 2MB
       # - 4MB
       # - 8MB
-      # - Test All Options
     # option_f:
       # - Default Test Directory
       # - /opt/rootfs
-      # - Test All Options
   - test:
     # - fluidx3d-1.2.0 # The test quit with a non-zero exit status.
   - test: fs-mark-1.0.3
@@ -316,7 +289,6 @@ phoronix-test-suite:
       - 2 # 1000 Files, 1MB Size, No Sync/FSync
       # - 3 # 5000 Files, 1MB Size, 4 Threads
       # - 4 # 4000 Files, 32 Sub Dirs, 1MB Size
-      # - Test All Options
   - test:
     - gcrypt-1.1.3
     - git-1.1.0
@@ -337,7 +309,6 @@ phoronix-test-suite:
       - modf
       - exp
       - log2
-      # - Test All Options
   - test:
     - gmpbench-1.3.0
     # - gnupg-2.4.0 # install failed
@@ -347,7 +318,6 @@ phoronix-test-suite:
       # - http # The test quit with a non-zero exit status.
       # - json # The test quit with a non-zero exit status.
       - garbage
-      # - Test All Options
   - test:
     - gpuowl-1.0.0
     # - graph500-1.0.1 # oom
@@ -360,7 +330,6 @@ phoronix-test-suite:
       - Rotate
       - Sharpen
       - Swirl
-      # - Test All Options
   - test:
     - gromacs-1.8.0
   - test: hackbench-1.0.0
@@ -371,11 +340,9 @@ phoronix-test-suite:
       # - 8
       # - 16
       # - 32 # The test quit with a non-zero exit status.
-      # - Test All Options
     option_b: # Type
       - Process
       - Thread
-      # - Test All Options
 
   - test:
     - hadoop-1.0.0
@@ -395,7 +362,6 @@ phoronix-test-suite:
       - 4
       - 64
       - 1024
-      # - Test All Options
   - test:
     - intel-mlc-1.1.0
 
@@ -410,34 +376,28 @@ phoronix-test-suite:
       # - 256MB
       # - 512MB
       - 1024MB
-      # - Test All Options
     option_b:
       - Default Test Directory
       # - /opt/rootfs # don't touch the rootfs dir
-      # - Test All Options
   - test: iozone-1.9.5
     option_a:
       - 4Kb
       # - 64Kb
       - 1MB
-      # - Test All Options
     option_b:
       - 512MB
       - 2GB
       # - 4GB
       # - 8GB
-      # - Test All Options
     option_c:
       - Write Performance
       - Read Performance
-      # - Test All Options
   - test: ipc-benchmark-1.0.0
     option_a:
       - Unnamed Pipe
       - FIFO Named Pipe
       - Unnamed Unix Domain Socket
       - TCP Socket
-      # - Test All Options
     option_b: # Message Bytes
       - 128
       # - 256
@@ -445,7 +405,6 @@ phoronix-test-suite:
       # - 1024
       # - 2048
       - 4096
-      # - Test All Options
   - test: java-scimark2-1.2.0
     option_a:
       - Composite
@@ -454,17 +413,14 @@ phoronix-test-suite:
       - Monte Carlo
       - Sparse Matrix Multiply
       - Dense LU Matrix Factorization
-      # - Test All Options
   - test: john-the-ripper-1.8.0
     option_a:
       - MD5
       - Blowfish
-      # - Test All Options
   - test: jpegxl-1.5.0
     option_a:
       - JPEG
       - PNG
-      # - Test All Options
     option_b:
       - 1 # 80
       - 2 # 90  [Default]
@@ -478,7 +434,6 @@ phoronix-test-suite:
     option_a:
       - Bosphorus 1080p
       - Bosphorus 4K
-      # - Test All Options
     option_b:
       - 1 # Slow
       - 2 # Medium     [Default]
@@ -499,7 +454,6 @@ phoronix-test-suite:
       - Monte Carlo
       - Sparse Matrix Multiply
       - Dense LU Matrix Factorization
-      # - Test All Options
   - test:
     - luaradio-1.0.0
     - lulesh-1.1.1
@@ -514,7 +468,6 @@ phoronix-test-suite:
       - Libdeflate 1
       - XZ 0
       - Crush 0
-      # - Test All Options
   - test:
     - m-queens-1.1.0
     - mafft-1.6.2
@@ -522,14 +475,12 @@ phoronix-test-suite:
     option_a:
       - Memory Copy
       - 2 # Memory Copy, Fixed Block Size
-      # - Test All Options
     option_b:
       - 128 MiB
       # - 512 MiB
       # - 1024 MiB
       # - 4096 MiB
       # - 8192 MiB
-      # - Test All Options
   # - test: mcperf-1.4.0 # not an available test
     # option_a:
       # - Get
@@ -539,7 +490,6 @@ phoronix-test-suite:
       # - Replace
       # - Append
       # - Prepend
-      # - Test All Options
     # option_b:
       # - 1
       # - 4
@@ -548,7 +498,6 @@ phoronix-test-suite:
       # - 64
       # - 128
       # - 256
-      # - Test All Options
   - test: memcached-1.2.0
     option_a:
       - "1:100"
@@ -556,7 +505,6 @@ phoronix-test-suite:
       - "1:5"
       - "1:1"
       - "5:1"
-      # - Test All Options
   - test:
     - memtier-benchmark-1.5.0
     - mencoder-1.5.0
@@ -569,14 +517,12 @@ phoronix-test-suite:
       - Small
       # - Medium # PHP Fatal error:  Allowed memory size of 1073741824 bytes exhausted
       - Large
-      # - Test All Options
 
   # - test: minion-1.5.2 # install failed
     # option_a:
       # - Graceful
       # - Quasigroup
       # - Solitaire
-      # - Test All Options
   - test:
     - mkl-dnn-1.3.1
     - mlpack-1.0.2
@@ -585,7 +531,6 @@ phoronix-test-suite:
     option_a:
       - Dust 2D tau100.0
       - Gas HII40
-      # - Test All Options
   - test:
     - mpcbench-1.0.1
     # - mrbayes-1.5.0 # temporarily comment out  the failed test
@@ -597,7 +542,6 @@ phoronix-test-suite:
       # - 3 # 1GB Array, 256 Byte Stride
       # - 4 # 1GB Array, 256 Byte Stride, 2 Threads
       - 5 # 1GB Array, 256 Byte Stride, 4 Threads
-      # - Test All Options
   # - test: mysqlslap-1.1.1 # temporarily comment out  the failed test
     # option_a: # clients
       # - 1
@@ -609,7 +553,6 @@ phoronix-test-suite:
       # - 128
       # - 256
       # - 512
-      # - Test All Options
   - test: mutex-1.0.0
     option_a:
       - Mutex Lock Unlock std::mutex
@@ -620,7 +563,6 @@ phoronix-test-suite:
       - Mutex Lock Unlock spinlock_amd
       - Shared Mutex Lock Shared
       - Semaphore Release And Acquire
-      # - Test All Options
   - test:
     - mysqlslap-1.4.0
     - n-queens-1.2.1
@@ -634,12 +576,10 @@ phoronix-test-suite:
       - CPU
       # - GPU # need CUDA compatible hardware
       - All (CPU + GPU)
-      # - Test All Options
   - test: nekrs-1.1.0
     option_a:
       - TurboPipe Periodic
       - Kershaw
-      # - Test All Options
   - test:
     - nero2d-1.1.0
     # - netperf-1.0.4 # install failed
@@ -649,7 +589,6 @@ phoronix-test-suite:
       - poly1305-aes
       - aes256
       - chacha
-      # - Test All Options
   - test:
     # - network-loopback-1.0.3 # The test quit with a non-zero exit status.
     - nginx-3.0.1
@@ -669,13 +608,11 @@ phoronix-test-suite:
       - IS.D [Integer Sort]
       - MG.C [Multi-Grid on a sequence of meshes]
       - CG.C [Conjugate Gradient]
-      # - Test All Options
   - test: nuttcp-1.0.3
     option_a:
       - TCP Transfer - Default
       - TCP Transfer - Server To Client
       - 10G+ UDP
-      # - Test All Options
     option_b:
       - "127.0.0.1"
   - test:
@@ -697,7 +634,6 @@ phoronix-test-suite:
       # - Flow MPI Norne
       # - Flow MPI Norne-4C MSW
       # - Flow MPI Extra # need non-public file omega-opm-2.tar.gz
-      # - Test All Options # this will run above 4 options in one job
     # option_b: # threads
       # - 1
       # - 2
@@ -707,7 +643,6 @@ phoronix-test-suite:
       # - 32
       # - 64
       # - 128
-      # - Test All Options
   - test:
     - optcarrot-1.0.1
   - test: osbench-1.0.2
@@ -717,7 +652,6 @@ phoronix-test-suite:
       - Create Threads
       - Launch Programs
       - Memory Allocations
-      # - Test All Options
   - test: ospray-2.12.0
     option_a:
       - gravity_spheres_volume/dim_512/ao/real_time
@@ -726,6 +660,5 @@ phoronix-test-suite:
       - particle_volume/ao/real_time
       - particle_volume/scivis/real_time
       - particle_volume/pathtracer/real_time
-      # - Test All Options
   - test:
     - ospray-studio-1.2.0
diff --git a/jobs/phoronix-test-suite-part2.yaml b/jobs/phoronix-test-suite-part2.yaml
index bd549e201..70250445c 100644
--- a/jobs/phoronix-test-suite-part2.yaml
+++ b/jobs/phoronix-test-suite-part2.yaml
@@ -12,7 +12,6 @@ phoronix-test-suite:
     option_a:
       - leblancbig
       - sedovbig
-      # - Test All Options
   - test: perf-bench-1.0.5
     option_a:
       - Sched Pipe
@@ -22,18 +21,15 @@ phoronix-test-suite:
       - Futex Hash
       - Futex Lock-Pi
       - Epoll Wait
-      # - Test All Options
   - test: perl-benchmark-1.0.1
     option_a:
       - Pod2html
       - Interpreter
-      # - Test All Options
 
   - test: php-1.0.0
     option_a:
       - Zend bench
       - Zend micro_bench
-      # - Test All Options
   - test:
     - phpbench-1.1.6
     - pjdfstest-1.0.1
@@ -45,7 +41,6 @@ phoronix-test-suite:
       - 3 Matrix Multiplications
       # - Correlation Computation # The test quit with a non-zero exit status.
       - Covariance Computation
-      # - Test All Options
   - test:
     - polyhedron-1.0.1
     - postmark-1.1.2
@@ -66,7 +61,6 @@ phoronix-test-suite:
     option_a:
       - Serial
       - SMP Parallel
-      # - Test All Options
   - test:
     - rays1bench-1.0.0
     - rbenchmark-1.0.3
@@ -77,12 +71,10 @@ phoronix-test-suite:
       - LPUSH
       - LPOP
       - SADD
-      # - Test All Options
     option_b:
       - 50
       - 500
       - 1000
-      # - Test All Options
   - test:
     - redshift-1.0.1
     - remhos-1.0.0
@@ -98,7 +90,6 @@ phoronix-test-suite:
       - Random Fill Sync
       - Random Read
       - Read While Writing
-      # - Test All Options
   - test: schbench-1.1.0
     option_a: # message threads
       - 2
@@ -107,7 +98,6 @@ phoronix-test-suite:
       # - 8
       # - 16
       - 32
-      # - Test All Options
     option_b: # workers per message thread
       - 2
       # - 4
@@ -116,7 +106,6 @@ phoronix-test-suite:
       # - 16
       # - 24
       - 32
-      # - Test All Options
   # - test:
     # - scikit-learn-1.1.0 # install failed
   - test: scimark2-1.3.2
@@ -127,7 +116,6 @@ phoronix-test-suite:
       - Monte Carlo
       - Sparse Matrix Multiply
       - Dense LU Matrix Factorization
-      # - Test All Options
   - test:
     - securemark-1.0.0
     # - serial-loopback-1.0.2 # need to really plug to serial ports
@@ -140,7 +128,6 @@ phoronix-test-suite:
       - Latency Under Load
       - Latency Ping Pong
       - Throughput
-      # - Test All Options
   - test:
     - spark-1.0.1
     # - speedb-1.0.1 # The test quit with a non-zero exit status.
@@ -200,7 +187,6 @@ phoronix-test-suite:
       - Wide Vector Math
       - AVX-512 VNNI
       - Mixed Scheduler
-      # - Test All Options
   - test:
     - stressapptest-1.0.1
     # - stresscpu2-1.0.1 # not performance test
@@ -212,7 +198,6 @@ phoronix-test-suite:
     option_a:
       - CPU
       - RAM / Memory
-      # - Test All Options
   - test:
     - system-decompress-bzip2-1.0.2
     # - system-decompress-gzip-1.1.1 # 3rd party url is N/A
@@ -226,7 +211,6 @@ phoronix-test-suite:
       - Kernel
       - Loader
       - Firmware
-      # - Test All Options
   # - test: system-libxml2-1.0.3 # install failed
     # option_a:
       # - 5 KB
@@ -253,17 +237,14 @@ phoronix-test-suite:
       # - 2 MB
       # - 3 MB
       # - 112 MB
-      # - Test All Options
   # - test: systester-1.0.0 # not an available test
     # option_a:
       # - Gauss-Legendre algorithm                  [Recommended.]
       # - Borwein's Quadratic Convergence algorithm [This Test Could take Hours to finish.]
-      # - Test All Options
     # option_b:
       # - 4 Million Digits
       # - 16 Million Digits [This Test could take a while to finish.]
       # - 64 Million Digits [This Test will take a long time to run.]
-      # - Test All Options
     # option_c:
       # - 1 thread   [Single Thread Test]
       # - 2 threads [2+ Cores Recommended]
@@ -272,7 +253,6 @@ phoronix-test-suite:
       # - 16 threads [8+ Cores Recommended]
       # - 32 threads [Recommended For Servers]
       # - 64 threads [Recommended For Servers]
-      # - Test All Options
   - test:
     - t-test1-1.0.1
     - tachyon-1.3.0
@@ -284,19 +264,16 @@ phoronix-test-suite:
       - Random Write
       - Read
       - Random Read
-      # - Test All Options
     option_b:
       - 32MB
       - 64MB
       # - 128MB
       # - 256MB
-      # - Test All Options
     option_c: # thread count
       - 4
       - 8
       # - 16
       # - 32
-      # - Test All Options
   - test:
     - tjbench-1.2.0
     - tnn-1.1.0
@@ -311,7 +288,6 @@ phoronix-test-suite:
       # - Water Caustic
       # - Non-Exponential
       # - Volumetric Caustic
-      # - Test All Options
   - test:
     - unpack-firefox-1.0.0
     - unpack-linux-1.2.0
@@ -326,7 +302,6 @@ phoronix-test-suite:
     option_b:
       - Bosphorus 1080p
       - Bosphorus 4K
-      # - Test All Options
   - test:
     - vvenc-1.9.1
     - webp-1.2.0
@@ -343,7 +318,6 @@ phoronix-test-suite:
       - Medium
       - Thorough
       - Exhaustive
-      # - Test All Options
   # - test: avifenc-1.1.1 # install failed
     # option_a:
       # - 1 # 0            [Slowest]
@@ -352,14 +326,12 @@ phoronix-test-suite:
       # - 4 # 6, Lossless  [Default Speed + Lossless]
       # - 5 # 10           [Fastest]
       # - 6 # 10, Lossless [Fastest]
-      # - Test All Options
   - test: basis-1.1.1
     option_a:
       - ETC1S
       - UASTC Level 0
       - UASTC Level 2
       - UASTC Level 3
-      # - Test All Options
   - test:
     # - brl-cad-1.1.2 # install failed
     - build2-1.2.0
@@ -367,7 +339,6 @@ phoronix-test-suite:
     # option_a:
       # - Square Plain C++
       # - Square Assembly Optimized
-      # - Test All Options
   # - test: cpuminer-opt-1.4.0 # install failed
     # option_a:
       # - 1 # Triple SHA-256, Onecoin
@@ -381,18 +352,15 @@ phoronix-test-suite:
       # - Deepcoin
       # - Skeincoin
       # - 11 # LBC, LBRY Credits
-      # - Test All Options
   - test: ethr-1.2.1
     option_a:
       # - TCP
       # - UDP
       - HTTP
-      # - Test All Options
     option_b:
       - Bandwidth
       # - Connections/s
       # - Latency
-      # - Test All Options
     option_c:
       - 1
       # - 2
@@ -401,7 +369,6 @@ phoronix-test-suite:
       # - 16
       # - 32
       # - 64
-      # - Test All Options
   - test: hbase-1.1.0
     option_a:
       - 1 # 10000    [Quickest]
@@ -418,7 +385,6 @@ phoronix-test-suite:
       - Sequential Read
       - Scan
       - Increment
-      # - Test All Options
     option_c:
       - 1 # 1
       # - 2 # 4
@@ -434,31 +400,26 @@ phoronix-test-suite:
       - input.i3d 129 Cells Per Direction [Intended For Small Systems]
       - input.i3d 193 Cells Per Direction
       # - X3D-benchmarking input.i3d        [Requires ~96GB of Available RAM]
-      # - Test All Options
   - test: intel-mpi-1.0.1
     option_a:
       - IMB-MPI1 PingPong
       - IMB-MPI1 Sendrecv
       - IMB-MPI1 Exchange
       - IMB-P2P PingPong
-      # - Test All Options
   - test: jpegxl-decode-1.5.0
     option_a:
       - 1
       - All
-      # - Test All Options
   - test: libgav1-1.2.1
     option_a:
       - Summer Nature 1080p
       - Summer Nature 4K
       - Chimera 1080p
       - Chimera 1080p 10-bit
-      # - Test All Options
   - test: ncnn-1.5.0
     option_a:
       - CPU
       - Vulkan GPU
-      # - Test All Options
   - test: pyperformance-1.0.2
     option_a:
       # - 2to3 # The test quit with a non-zero exit status.
@@ -474,11 +435,9 @@ phoronix-test-suite:
       # - python_startup # The test quit with a non-zero exit status.
       # - raytrace # The test quit with a non-zero exit status.
       # - regex_compile # The test quit with a non-zero exit status.
-      # - Test All Options
   # - test: rav1e-1.5.0 # install failed
     # option_a:
       # - 10 [Fastest]
       # - 6  [Default]
       # - 5  [Mid-Speed]
       # - 1  [Slowest / Best Quality]
-      # - Test All Options
diff --git a/jobs/phoronix-test-suite-part3.yaml b/jobs/phoronix-test-suite-part3.yaml
index 75f8f5b94..2e96dd450 100644
--- a/jobs/phoronix-test-suite-part3.yaml
+++ b/jobs/phoronix-test-suite-part3.yaml
@@ -26,7 +26,6 @@ phoronix-test-suite:
       - 1 # 240  [Intended for very slow systems or just a quick reference run.]
       - 2 # 1200
       - 3 # 2400 [Just intended for very large core count servers / HPC]
-      # - 4 # Test All Options
 
   - test: openssl-3.1.0
     option_a:
@@ -37,7 +36,6 @@ phoronix-test-suite:
       - AES-256-GCM
       - ChaCha20
       - ChaCha20-Poly1305
-      # - Test All Options
 
   # - test: dragonflydb-1.1.0 # The test run did not produce a result.
   #   option_a:
@@ -46,36 +44,30 @@ phoronix-test-suite:
   #     - 50
   #     - 60
   #     - 100
-  #     # - Test All Options
   #   option_b:
   #     - "1:100"
   #     - "1:10"
   #     - "1:5"
   #     - "1:1"
   #     - "5:1"
-  #     # - Test All Options
 
   - test: cryptopp-1.1.0
     option_a:
       - Unkeyed Algorithms
       - Keyed Algorithms
       # - All Algorithms     [This option can be very time consuming.]
-      # - Test All Options
 
   # - test: etcd-1.0.0 # Estimated Time To Completion: 49 Minutes
     # option_a:
       # - PUT
       # - RANGE
-      # - Test All Options
     # option_b:
       # - 50
       # - 100
       # - 500
-      # - Test All Options
     # option_c:
       # - 100
       # - 1000
-      # - Test All Options
 
   # - test: hammerdb-mariadb-1.1.0
     # option_a:
@@ -86,19 +78,16 @@ phoronix-test-suite:
       # - 128
       # - 256
       # - 512
-      # - Test All Options
     # option_b:
       # - 100
       # - 250
       # - 500
       # - 1000
-      # - Test All Options
 
   - test: lczero-1.7.0
     option_a:
       - BLAS
       - Eigen
-      # - Test All Options
 
   - test: lammps-1.4.0
     option_a:
@@ -110,13 +99,11 @@ phoronix-test-suite:
     option_a:
       - C2670
       - C7552
-      # - Test All Options
 
   - test: blogbench-1.1.0
     option_a:
       - Read
       - Write
-      # - Test All Options
 
   - test: laghos-1.0.0
     option_a:
@@ -130,18 +117,15 @@ phoronix-test-suite:
       - 2 # POSIX Timer, Interval 10000 ms, 10000 Loops
       - 3 # clock_nanosleep TIME_ABSTIME, Interval 500 ms, 100000 Loops
       - 4 # POSIX Timer, Interval 500 ms, 100000 Loops
-      # - Test All Options
 
   - test: couchdb-1.3.0
     option_a:
       - 100
       - 300
       - 500
-      # - Test All Options
     option_b:
       - 1000
       - 3000
-      # - Test All Options
 
   # - test: hpcg-1.3.0 # oom
   #   option_a:
@@ -149,11 +133,9 @@ phoronix-test-suite:
   #     - 144 144 144
   #     - 160 160 160
   #     - 192 192 192
-  #     # - Test All Options
   #   option_b:
   #     - 1 # 60   [Shorter run-time]
   #     - 2 # 1800 [Official run-time]
-  #     # - 3 # Test All Options
 
   # - test: interbench-1.0.1 # all the option combinations result in "no space left on device"
     # option_a:
@@ -166,7 +148,6 @@ phoronix-test-suite:
       # - Memload
       # - Write
       # - Read
-      # - Test All Options
     # option_b:
       # - Gaming
       # - Compile # Video-Compile combination writes more than 400G file to disk
@@ -177,7 +158,6 @@ phoronix-test-suite:
       # - Memload
       # - Write
       # - Read
-      # - Test All Options
 
   - test: opencv-1.3.0
     option_a:
@@ -189,7 +169,6 @@ phoronix-test-suite:
       - Image Processing
       - Stitching
       - Video
-      # - Test All Options
 
   - test: openfoam-1.2.0
     option_a:
@@ -197,14 +176,12 @@ phoronix-test-suite:
       - 2 # drivaerFastback, Small Mesh Size  [Less time consuming, still needs a powerful CPU]
       # - 3 # drivaerFastback, Medium Mesh Size [3M Cells] # The test quit with a non-zero exit status.
       # - 4 # drivaerFastback, Large Mesh Size  [22.5M Cells, most time consuming] # The test quit with a non-zero exit status.
-      # - 5 # Test All Options
 
   - test: openvkl-2.0.0
     option_a:
       - vklBenchmarkCPU Scalar
       - vklBenchmarkCPU ISPC
       # - vklBenchmarkGPU Intel oneAPI SYCL # The test run did not produce a result.
-      # - Test All Options
 
   - test: pgbench-1.14.0
     option_a: # Scaling Factor
@@ -213,7 +190,6 @@ phoronix-test-suite:
       # - 3 # 1000
       - 4 # 10000
       # - 5 # 25000 [Intended for very large servers.]
-      # - 6 # Test All Options
     option_b: # Clients
       # - 1
       # - 50
@@ -223,11 +199,9 @@ phoronix-test-suite:
       - 800
       # - 1000
       # - 5000
-      # - Test All Options
     option_c: # Mode
       - Read Write
       - Read Only
-      # - Test All Options
 
   - test: renaissance-1.3.0
     option_a:
@@ -242,18 +216,15 @@ phoronix-test-suite:
       - 9 # Finagle HTTP Requests
       - 10 # Genetic Algorithm Using Jenetics + Futures
       - 11 # ALS Movie Lens
-      # - 12 # Test All Options
 
   - test: startup-time-1.4.1
     option_a: # Background I/O Mix
       - Only Sequential Reads # need more than 1h
       - Sequential Reads + Writes
-      - Test All Options
     option_b: # Application To Start
       - GNOME Terminal
       # - xterm
       # - LibreOffice Writer
-      - Test All Options
     option_c: # Disk Target
       - /opt/rootfs
 
@@ -261,7 +232,6 @@ phoronix-test-suite:
     option_a:
       - 12 digit
       - 14 digit
-      # - Test All Options
     
   - test: webp2-1.2.1
     option_a:
@@ -270,4 +240,3 @@ phoronix-test-suite:
       - 3 # Quality 95, Compression Effort 7
       - 4 # Quality 100, Compression Effort 5
       - 5 # Quality 100, Lossless Compression
-      # - Test All Options