Review Request #9949 — Created May 15, 2018 and submitted
Due to the ordering of landed commits, some tests weren't updated to use
subclass-defined consent requirements. This fixes up those tests so that
Unit tests pass.