Fixed client-side tests