adding cmd arguments to generate many tests

+ a little refactor