Revert "Fix a typo..."

This reverts commit a2e5afe50f3ac9daf1a691e2ca416749647bd4b1.
Revert "Add workaround for long test time"

Does not work well in some environments...
This reverts commit 9e3f773e19f16088d4703e5333e82e36d6d5f91e.