EAGLESIX-2651: First: del test fn names if ours