Fix some unit tests from previous commit

Mostly deal with having the tests set ClientServerServices.Current.

Change-Id: I8ee1a8e39ba4b4e8b5aa4f1cf0405704bc7376dd