Revert "Remove Controller::Role::Meta::* which doesn't appear to do anything"

This reverts commit 6129bd36a12c696d13ca83f239f807cda48d74e4.
Fix up UnconfirmedEmailAddresses test