Refactoring Clustering Test
Staging, All Specs Passed
Hack Cluster Mode
Pass Both Cluster & Non-Cluster Specs
Include new specs