Fix random UT failure in aop module