complete AdvertiseExt and add tests