pkg/client: refactor tests
pkg/client: remove dead code