Merge "Adding Security gateway testing"