addition of work around testing on all clients

also allows clients to be used in a generic where clause