Revert "Fixes tests"

This reverts commit 45a07689423a32daafa25cd92ecba304f852c38f.