Update the permission service and it's tests