Upgrade roles logic to new dynamics interface.
More tests!