Renamed testjson to testdata. All test data now uses same folder. Minor refactors