Makes it slightly easier to test whether the installed module works or not. Depends on D10656 Ref T86579
cleanup
LGTM, but would require Campbell to also have a look at those.