Removing reliance on globals in prep for multi-testsuite support in dashboard