Fixed client unit tests