Improve coverage of rename/retag/reident or delete them

[olynch]

I'm merging the multiple-inheritance branch even though not all of the rename/retag/reident methods have been covered. However, we should get to these eventually.