Implemented better test data generator