Fixed and reorganized the testdata.json integration.