Strengthen clustering tests