client Map test clean up and more tests,