Fix server-side tests