Removed simplejson dependency
Added unit tests