Merge "Correct server basic ops test case name"