APY-13 : Complete the security gateway

Removed the testings