[Client] Refactored func tests