fix apiClients + tests