Fixed an obvious bug in Json helper
Better Client test coverage