Add annotations for clients and client_type

Also fixes getattr approach to collecting the previously untyped clients
variable depending on which client the test needs.

Author: ogenstad