Add clustering tests