Revert "Clean up tests"

This reverts commit cebd6dcd1f9ddd0728a6d4b9d6e34f04beb8a035.