Updates to better-support modular release tests