Added tests and updated .json file