Improved testing and added the json data files