Merge pull request #3655 from ahnh/CI_Security_Unit_Test

Improve CI_Security unit tests coverage