Fix unit tests.

Clean-up all the structures on remove: remove/add is used to setup the
tests.