Reduce test boilerplate
Untested oauth handling code