Bugzilla 1065356: Fix ClusterMapTest to reflect change in behavior