completed destroy action
fixed error in macro and adjusted tests