Revert "Made the tester class a tiny bit less ugly."

This reverts commit b914dc84037009aa68b0e8fb702e04c09e188b93.