Reorganize tests for JSON utils
More test refactoring