some fixes for clustering tests