Refactored OAuth1AService, still need to rewrite tests