Fix tests after merge conflicts#796

MarkSymsCtx merged 1 commit into

xapi-project:masterxapi-project/sm:masterfrom

MarkSymsCtx:fix_testsMarkSymsCtx/sm:fix_testsCopy head branch name to clipboard