Cleanup and added the oAuth properties for testing.