correct token spec
correct tenants spec
restore retry logic
roles spec
credentials specs
clean up puts
model specs