Updated server and beginning of client (with tester)