Removed pattern scopes and tests