Fix clustering tests