Cleanup the test a bit. It was too dependent on the output order.