Fix typo and make tests not dependant on serialization order.