Fix failing tests due to new JSON formatting in files