Also adds tests for that feature flag, pushing it over
the danger-review limit requiring longer commit message.