wip for test_contentstore fixes