Updates the orphaned tests to reflect the new signatures of ClusterMap
interface