OAuth exception stuff, and cleaned up 2 tests