Restructuring tests for cluster view