Added some basic coverage for json, preparing to remove