Some more tweaks to clustering tests