get rid of role, fix tests