Fixed tests relying on attribute order (bug 1085501)