Merge pull request #618 from bhariharan/unstable

Merge branch 'master' into unstable
Add instance URL to account name
Fixing tests
Fix account_name in tests
Fixing test account name
Merge pull request #619 from bhariharan/master

Add instance URL to account name
Merge branch 'master' into unstable