Revert "More flags for tests"

This reverts commit 86ac3bdb87ec1d06e7e11f589154791d29cea62e.
more tests