test add/remove + cleanup