Added also test in which we add/remove addresses + name at same time.
Slight cleanup - got rid of the duplicate code.
Even further paranoia code ;)