Fix the signature of a test function
Merge branch '2.4'