More Work on the test generator