add #edit_ad with part of the tests & some restructuring