Fixing client-side tests