oauth tests - merging account
Merge branch 'develop'