A couple more tweaks to worldwide test helpers