Revert "Fix tests"

This reverts commit d1d33d8935897f57d9dba4df9aff7c60d70a1633.