Test and JSON string improvement