org.json toJson updates and tests