Update the UT to be concurrent

Update the UT to be concurrent and merge with the latest master branch.