Revert "Fix tests"

This reverts commit afe715b830cd943388f3ac9357cf81eff74376c3.