* switch to ACTIVITI roles * double set of roles * minor typing fixes * use different account * Revert "use different account" This reverts commit 1f89fb490e8be1614fbdef391ddc8a536ec8de82. * fix test