Change structure to allow for reuse of scripts by bundle PR testing