Fix test: trying to not rely on HashMap order