Fix client tests
Fix server tests