JSON edits; added test