Update ScopeInterface w/ tests
Merge pull request #5878 from HipsterJazzbo/5.0-update-scopeinterface

[5.0] Improve And Fix Scopes