* Improve docs & handle scopeAttribute in a similar matter as we do for ScopeAttribute

* Add tests for the scoped scopeAttribute scenario