#900 Part 4 - Test Helpers

This is the 4th part of a chain of pull requests that will all be pulled in together. I separated them out to make it easier to review

---

This is just me pulling in the test helpers I had in the OAuth branch because they're so helpful :). Doesn't really need to be reviewed, but feel free to skim.