Revert "Add a hack to be able to run the tests"

This reverts commit 2542a526bdff880376960b5f38ba48ac822f0184.