Include address in samples
updated version, unit tests