Add a test-control to disable the skip-scan optimization.