Fix oauth tests to account for auto-grants