fix grammer error in comment
add unit tests
Merge remote-tracking branch 'origin/storage-chuyu'