Revert "Revert "revert test settings""

This reverts commit 8c1f989e395fc30db7329aedc2f22be041fb94d9.
Revert "Revert "Revert "revert test settings"""

This reverts commit 4cc19b9d3e4565c2a4ff9e95c6ccb6109fae68fa.