Add test for correct location processing. Modify json order to pass test