Added test data generation