Add AddressDAO and TestAddressDAO