Merge "Fix importing security group tests"