Fix failing json tests (property order)