Speedup of the ClusterQueueTest
Speedup of the ClientMapTest
Merge pull request #1857 from pveentjer/test-cleanup

Test cleanup
Minor testing cleanup
More cleanup
More cleanup
More testing cleanup
Minor cleanup