Fixed failing tests which incorrectly assumed order.