Fix tests that are failing due to JSON ordering.