reorg storage_test and identity_test