Revert "Playing trying to fix tests"

This reverts commit e8c6bd3871127e94f6b94d5e8cde6b7a2b1983a8.