Add generic add_remove_add test