Fix UT
Merge branch 'deletes' into upgradesdk