code clean up and adding Address Builder Test