Added ClientClass, updated TestClass