modified oauth merge method, finished unit tests