Update assertion to check inclusion of roles, to avoid order problems