Revert "Merge branch 'fix_tests'"

This reverts commit 23724696f0104888c87d4a8a618ffacb6546b67d, reversing
changes made to 2adcc1ab15955246c075a9bfef1377a93947a9a7.