Backport to branch(3.16) : Minor fixes to unit tests#2828

brfrn169 merged 2 commits into3.16scalar-labs/scalardb:3.16from

3.16-pull-2825scalar-labs/scalardb:3.16-pull-2825Copy head branch name to clipboard