client MultiMap tests clean up and small tests added