fix UT confilication with latest patches