Change address visualization. Fix some test failures