Try to get rid of test reqs altogether