[finishes #57940610] all tests passing for refactoring of CollectionManager