Role test fixes