Moving things to json and test files