OAuth update and Unit Test. And fix Catalog