Do we need to include this? I did not see any compilation error when I removed this.
Now for the second part with the SRF making the injection point information available at SQL level. The point about adding the new function in the core engine has been sticky, and I'm coming down to the conclusion that I'd still want to make this stuff backpatchable if need be in the future. So let's just add a new function in the test module injection_points and call it a day.
Do you plan to document this function anywhere where it would be more visible to those who might want to use it in their tests?