[Storage] Refactoring of document building
[Storage] Complete simple search test case