Updating the Account API
Updating tests
Merge branch 'develop'