testsGenerator improved