Add to clientmanager tests

Change-Id: Iea59c494f31de9c3e1d662f89e6e2babcc8fbd61
Merge "Add to clientmanager tests"