Added Test Clients
Merge branch 'new-server'