Merge branch 'hotfix/fix-wrong-assertion-to-nda'
unit test update
Fixed the access to the NDA
Merge branch 'hotfix/fix-replace-call-nda' into develop