oauth tests 1
Merge branch 'develop'