Updated tests to use JsonUtils.json function instead of one rolled specifically for unit testing