Revert "Refactored tests."

This reverts commit 9d9bdac462d9ffd0d41ae1343f0ee9e373ed5bb7.