Use node clients for now until tests stabelize