Remove roles from nodesets
Update acceptance tests