Issue 20011: Fixed broken test and function