including updates to testDataGeneration script and .json files that I left out of the last commit