Client class was simplified. New tests were added.