Make 25-test_gen.t and 25-test_req.t into one