Refactored Unit tests to work with OAuth