Revert "Test improvements."

This reverts commit 61a073a619120bb7cb55e7a7b4fef300df4e7f92.