Fix very slow unit-test data generation in some cases