TST: fix tests to properly add/remove (callbacks oohf)