Revert "enhance the test flexibility for auto-test"

This reverts commit b09f37e5d0d93d33fd5930222cc106708d85e1ed.
3 files changed