improved test coverage around scopes