Nit-- I'd love a couple simple unit tests of these individual methods. I agree the methods are pretty trivial, but it's best practice to unit test the individual parts.

I won't absolutely require it since your test_contenstore test hits them, and the logic is very simple in the methods.