Added Cluster View tests