Fixed test cases
Added Security feature
Merge branch 'feature/security' into develop