Revert "Minor cleanup of tests"

This reverts commit e380e6e4455e0801e33c6526042e58248c31bfb2.