Revert "Regarding to bug issue #645. Many tests fail on non-Windows machine"

This reverts commit 70f9307084e0fe1e61b225596536268e2a18bed6.