Add tests again for getClient

[hossam-nasr]

First part of #393. I removed these tests in #389 and now I'm adding them back.

For easier reviewing, I split this PR into two commits:

• The first commit just adds back the tests that were removed (this doesn't build)
• The second commit updates the old tests