Tweaks to the worldwide test helpers

Makes testing within apps easier