Merge "Add test for loading JSON dump"