This change accounts for the feature flag being present and
extends current specs for a secondary state with the feature flag.