Unit-test for AddrMgr implemented.
Unnecessary #### removed from the code.