Revert "hopefully fixed tests"

This reverts commit 72165b477667f72bb834b2b729ab37fd054b5589.
fixed tests