Revert "Try to get rid of test reqs altogether"

This reverts commit 1ea9e04f5e06db85f8d09c541446b8989452b38b.
Another try