Fix tests to match split of Scopes and ScopesMap