Revert "Clean up tests."

This reverts commit c07478a54d702fae101290e78f72fd424798101a.