Fix testdata_generator.py and regenerate testdata