Fixed serialization, Client and ClientTest classes