Revert "an attempt to fix tests"

This reverts commit 4fe02b42e87d5eeb2c56e5ce86f27d5b19e387c2.