Updated test data gen