fix duplicate asm
fix provisioning test issues introduced by NMS-7231