Modify the tests for the (sorted) order that the attributes come out as now.