Tidy up the factory syntax
Stub updated oauth token posts from the tests