ClientMapTest fixes..

Fixes #1211.
Fixes #1212.
Fixes #1216.