Fix attribute ordering in tests