Revert "Fix tests"

This reverts commit 528efb102d413d012b5948fc2414e22ca67cce78.