Revert "Refactor tests."

This reverts commit 5a0c2de394289eca1a496a57c06a92421c074ca2.