added sample test and changed name of addressmanager
merged commits (sry for not rebasing)