Improve test data generation