Merge "Modify security service list test"