Resolved TODO: isPartOfScopeTest is now variability aware.