Changed to OAuth terminology and somewhat fleshed out the Phase 3 feature tests.