Fixed tests
Merge branch 'Services' into services-reader

Conflicts:
	role.go
	role_test.go