#37, rewrite the generator
#37, let the generator take an argument of the number of tests