Verify everything is on the account level scope closes #152.
Fixed failing test.
Merge pull request #900 from affektive/misc_fixes

Verify everything is on the account level scope closes #152.