added test json file, fixed some bugs, need to redo returning json in models