Replace some tests by test generator