Again, I think `contentstore = contentstore()` at the top of `test_locking`, and then switching from the function to the variable throughout, is better.