Modify Clustering Tests in line with the KW changes