Fixed map syntax and some testing on client_comm