RES-1297: Fixed issues from Travis CI
RES-1297: Fixed json
RES-1297: fix json