Merge "Update test cases after security group menthods improvements."