Make sure add methods are unique by object identifier.
Add cleanup to tests.