move address stuff into address namespace, adjust tests