DocumentStore upsert improved
Integration test added