Added testing functionality to Client.