[new index structure] Better StorageManager.close test.
[new index structure] merge