Change address to use MockAddressEntity