Merge "Increase the number of test service names"