Revert "Fix failing tests"

This reverts commit 1fd8fde4ca149c60cb65b8be7c01458d507405a3.