In this branch, there's still a lot of calls to get_instance in tests (e.g. test_contentstore).  Are those being removed in other PRs?