Small clean up
Json util changed to class from singleton, and tests added