Added Role enum, fixed service tests