Test with and without feature flag