Code review comment for lp:~jstpierre/loggerhead/fix-569358

Tested manually, and the new tests look just right for what we want. Thanks for working on this, and thanks for responding to requests for tests. Looks great.