Create a better test generator