Updated tests to handle change in attribute order