Improve data generation in fixtures