small misc style fixes
partial refactor for TestUtils, combine ClientMap and ServerMap
TestUtils completed