Refactoring of data generator and executor.
Extending the jUnit test for data generation