* Fix: No comma when locality is empty * better cleanup on address string * fix test to one-liner * add more testing