[Dev] Update Client & Server Test