Fix tests, flesh out roles in AuthService