remove more cruft
rename roles
migrate role names
move tests
migrate tests, add test checking for role